diff --git a/PCK-Studio/Classes/FormColoring/coloringModes.cs b/PCK-Studio/Classes/FormColoring/coloringModes.cs index 300a8b0e..bd65f41e 100644 --- a/PCK-Studio/Classes/FormColoring/coloringModes.cs +++ b/PCK-Studio/Classes/FormColoring/coloringModes.cs @@ -13,10 +13,8 @@ */ using CBH.Ultimate.Controls; -using System; using System.Drawing; using System.IO; -using System.Reflection; using System.Windows.Forms; namespace PckStudio.Classes.FormColoring diff --git a/PCK-Studio/Forms/Editor/BoxEditor.Designer.cs b/PCK-Studio/Forms/Editor/BoxEditor.Designer.cs index 24f7345b..fe2c4313 100644 --- a/PCK-Studio/Forms/Editor/BoxEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/BoxEditor.Designer.cs @@ -67,7 +67,7 @@ // parentLabel.AutoSize = true; parentLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - parentLabel.Location = new System.Drawing.Point(416, 83); + parentLabel.Location = new System.Drawing.Point(416, 28); parentLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); parentLabel.Name = "parentLabel"; parentLabel.Size = new System.Drawing.Size(64, 25); @@ -79,7 +79,7 @@ // positionLabel.AutoSize = true; positionLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - positionLabel.Location = new System.Drawing.Point(38, 83); + positionLabel.Location = new System.Drawing.Point(38, 28); positionLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); positionLabel.Name = "positionLabel"; positionLabel.Size = new System.Drawing.Size(75, 25); @@ -91,7 +91,7 @@ // sizeLabel.AutoSize = true; sizeLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - sizeLabel.Location = new System.Drawing.Point(38, 112); + sizeLabel.Location = new System.Drawing.Point(38, 57); sizeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); sizeLabel.Name = "sizeLabel"; sizeLabel.Size = new System.Drawing.Size(46, 25); @@ -103,7 +103,7 @@ // uvLabel.AutoSize = true; uvLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - uvLabel.Location = new System.Drawing.Point(38, 142); + uvLabel.Location = new System.Drawing.Point(38, 87); uvLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); uvLabel.Name = "uvLabel"; uvLabel.Size = new System.Drawing.Size(39, 25); @@ -115,7 +115,7 @@ // inflationLabel.AutoSize = true; inflationLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - inflationLabel.Location = new System.Drawing.Point(38, 172); + inflationLabel.Location = new System.Drawing.Point(38, 117); inflationLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); inflationLabel.Name = "inflationLabel"; inflationLabel.Size = new System.Drawing.Size(55, 25); @@ -125,7 +125,7 @@ // // closeButton // - this.closeButton.Location = new System.Drawing.Point(294, 216); + this.closeButton.Location = new System.Drawing.Point(294, 161); this.closeButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.closeButton.Name = "closeButton"; this.closeButton.Size = new System.Drawing.Size(147, 27); @@ -170,7 +170,7 @@ "ARMARMOR0", "BODYARMOR", "BELT"}); - this.parentComboBox.Location = new System.Drawing.Point(486, 83); + this.parentComboBox.Location = new System.Drawing.Point(486, 28); this.parentComboBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.parentComboBox.Name = "parentComboBox"; this.parentComboBox.Size = new System.Drawing.Size(190, 29); @@ -188,7 +188,7 @@ 0, 0, 65536}); - this.PosXUpDown.Location = new System.Drawing.Point(140, 88); + this.PosXUpDown.Location = new System.Drawing.Point(140, 33); this.PosXUpDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.PosXUpDown.Maximum = new decimal(new int[] { 9999, @@ -214,7 +214,7 @@ 0, 0, 65536}); - this.PosYUpDown.Location = new System.Drawing.Point(232, 88); + this.PosYUpDown.Location = new System.Drawing.Point(232, 33); this.PosYUpDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.PosYUpDown.Maximum = new decimal(new int[] { 9999, @@ -240,7 +240,7 @@ 0, 0, 65536}); - this.PosZUpDown.Location = new System.Drawing.Point(324, 88); + this.PosZUpDown.Location = new System.Drawing.Point(324, 33); this.PosZUpDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.PosZUpDown.Maximum = new decimal(new int[] { 9999, @@ -266,7 +266,7 @@ 0, 0, 65536}); - this.SizeZUpDown.Location = new System.Drawing.Point(324, 118); + this.SizeZUpDown.Location = new System.Drawing.Point(324, 63); this.SizeZUpDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.SizeZUpDown.Maximum = new decimal(new int[] { 9999, @@ -287,7 +287,7 @@ 0, 0, 65536}); - this.SizeYUpDown.Location = new System.Drawing.Point(232, 118); + this.SizeYUpDown.Location = new System.Drawing.Point(232, 63); this.SizeYUpDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.SizeYUpDown.Maximum = new decimal(new int[] { 9999, @@ -308,7 +308,7 @@ 0, 0, 65536}); - this.SizeXUpDown.Location = new System.Drawing.Point(140, 118); + this.SizeXUpDown.Location = new System.Drawing.Point(140, 63); this.SizeXUpDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.SizeXUpDown.Maximum = new decimal(new int[] { 9999, @@ -329,7 +329,7 @@ 0, 0, 65536}); - this.uvYUpDown.Location = new System.Drawing.Point(232, 148); + this.uvYUpDown.Location = new System.Drawing.Point(232, 93); this.uvYUpDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.uvYUpDown.Maximum = new decimal(new int[] { 9999, @@ -355,7 +355,7 @@ 0, 0, 65536}); - this.uvXUpDown.Location = new System.Drawing.Point(140, 148); + this.uvXUpDown.Location = new System.Drawing.Point(140, 93); this.uvXUpDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.uvXUpDown.Maximum = new decimal(new int[] { 9999, @@ -378,7 +378,7 @@ this.armorCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Tall; this.armorCheckBox.FontWeight = MetroFramework.MetroCheckBoxWeight.Light; this.armorCheckBox.ForeColor = System.Drawing.Color.White; - this.armorCheckBox.Location = new System.Drawing.Point(424, 117); + this.armorCheckBox.Location = new System.Drawing.Point(424, 62); this.armorCheckBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.armorCheckBox.Name = "armorCheckBox"; this.armorCheckBox.Size = new System.Drawing.Size(225, 25); @@ -392,7 +392,7 @@ this.mirrorCheckBox.AutoSize = true; this.mirrorCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Tall; this.mirrorCheckBox.FontWeight = MetroFramework.MetroCheckBoxWeight.Light; - this.mirrorCheckBox.Location = new System.Drawing.Point(424, 150); + this.mirrorCheckBox.Location = new System.Drawing.Point(424, 95); this.mirrorCheckBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.mirrorCheckBox.Name = "mirrorCheckBox"; this.mirrorCheckBox.Size = new System.Drawing.Size(133, 25); @@ -411,7 +411,7 @@ 0, 0, 65536}); - this.inflationUpDown.Location = new System.Drawing.Point(140, 178); + this.inflationUpDown.Location = new System.Drawing.Point(140, 123); this.inflationUpDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.inflationUpDown.Maximum = new decimal(new int[] { 9999, @@ -427,7 +427,7 @@ 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(716, 254); + this.ClientSize = new System.Drawing.Size(716, 216); this.Controls.Add(this.inflationUpDown); this.Controls.Add(this.uvYUpDown); this.Controls.Add(this.uvXUpDown); diff --git a/PCK-Studio/Forms/Editor/BoxEditor.cs b/PCK-Studio/Forms/Editor/BoxEditor.cs index 2fd79e50..98170339 100644 --- a/PCK-Studio/Forms/Editor/BoxEditor.cs +++ b/PCK-Studio/Forms/Editor/BoxEditor.cs @@ -1,23 +1,23 @@ -using PckStudio.ToolboxItems; +using PckStudio.Internal; +using PckStudio.Properties; +using PckStudio.ToolboxItems; using System; using System.Windows.Forms; -using PckStudio.Internal; -using PckStudio.Properties; namespace PckStudio.Forms.Editor { - public partial class BoxEditor : ThemeForm - { - public string Result; + public partial class BoxEditor : ThemeForm + { + public string Result; - public BoxEditor(string box, bool hasInflation) - : this(SkinBOX.FromString(box), hasInflation) - { - } + public BoxEditor(string box, bool hasInflation) + : this(SkinBOX.FromString(box), hasInflation) + { + } - public BoxEditor(SkinBOX box, bool hasInflation) - { - InitializeComponent(); + public BoxEditor(SkinBOX box, bool hasInflation) + { + InitializeComponent(); if (string.IsNullOrEmpty(box.Type) || !parentComboBox.Items.Contains(box.Type)) { @@ -28,39 +28,39 @@ namespace PckStudio.Forms.Editor inflationUpDown.Enabled = hasInflation; - parentComboBox.SelectedItem = parentComboBox.Items[parentComboBox.Items.IndexOf(box.Type)]; - PosXUpDown.Value = (decimal)box.Pos.X; - PosYUpDown.Value = (decimal)box.Pos.Y; - PosZUpDown.Value = (decimal)box.Pos.Z; - SizeXUpDown.Value = (decimal)box.Size.X; - SizeYUpDown.Value = (decimal)box.Size.Y; - SizeZUpDown.Value = (decimal)box.Size.Z; - uvXUpDown.Value = (decimal)box.UV.X; - uvYUpDown.Value = (decimal)box.UV.Y; - armorCheckBox.Checked = box.HideWithArmor; - mirrorCheckBox.Checked = box.Mirror; - inflationUpDown.Value = (decimal)box.Scale; - } + parentComboBox.SelectedItem = parentComboBox.Items[parentComboBox.Items.IndexOf(box.Type)]; + PosXUpDown.Value = (decimal)box.Pos.X; + PosYUpDown.Value = (decimal)box.Pos.Y; + PosZUpDown.Value = (decimal)box.Pos.Z; + SizeXUpDown.Value = (decimal)box.Size.X; + SizeYUpDown.Value = (decimal)box.Size.Y; + SizeZUpDown.Value = (decimal)box.Size.Z; + uvXUpDown.Value = (decimal)box.UV.X; + uvYUpDown.Value = (decimal)box.UV.Y; + armorCheckBox.Checked = box.HideWithArmor; + mirrorCheckBox.Checked = box.Mirror; + inflationUpDown.Value = (decimal)box.Scale; + } - private void saveButton_Click(object sender, EventArgs e) - { - Result = - $"{parentComboBox.SelectedItem} " + - $"{PosXUpDown.Value} {PosYUpDown.Value} {PosZUpDown.Value} " + - $"{SizeXUpDown.Value} {SizeYUpDown.Value} {SizeZUpDown.Value} " + - $"{uvXUpDown.Value} {uvYUpDown.Value} " + - $"{Convert.ToInt32(armorCheckBox.Checked)} " + - $"{Convert.ToInt32(mirrorCheckBox.Checked)} " + - $"{inflationUpDown.Value}"; - DialogResult = DialogResult.OK; - } + private void saveButton_Click(object sender, EventArgs e) + { + Result = + $"{parentComboBox.SelectedItem} " + + $"{PosXUpDown.Value} {PosYUpDown.Value} {PosZUpDown.Value} " + + $"{SizeXUpDown.Value} {SizeYUpDown.Value} {SizeZUpDown.Value} " + + $"{uvXUpDown.Value} {uvYUpDown.Value} " + + $"{Convert.ToInt32(armorCheckBox.Checked)} " + + $"{Convert.ToInt32(mirrorCheckBox.Checked)} " + + $"{inflationUpDown.Value}"; + DialogResult = DialogResult.OK; + } private void BoxEditor_FormClosing(object sender, FormClosingEventArgs e) { - if (Settings.Default.AutoSaveChanges) - { - saveButton_Click(sender, EventArgs.Empty); - } + if (Settings.Default.AutoSaveChanges) + { + saveButton_Click(sender, EventArgs.Empty); + } } } } diff --git a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs index f54e11cd..100282ea 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs @@ -99,6 +99,7 @@ namespace PckStudio.Forms.Editor // // metroPanel1 // + this.metroPanel1.Controls.Add(this.tabControl); this.metroPanel1.Controls.Add(this.metroTextBox1); this.metroPanel1.Controls.Add(this.metroLabel2); this.metroPanel1.Controls.Add(this.setColorBtn); @@ -544,7 +545,6 @@ namespace PckStudio.Forms.Editor 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.menuStrip); - this.Controls.Add(this.tabControl); this.Controls.Add(this.metroPanel1); this.ForeColor = System.Drawing.Color.White; this.Name = "COLEditor"; diff --git a/PCK-Studio/Forms/Editor/COLEditor.resx b/PCK-Studio/Forms/Editor/COLEditor.resx index d21f9aff..a83e6635 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.resx +++ b/PCK-Studio/Forms/Editor/COLEditor.resx @@ -118,20 +118,302 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Bottom, Left + + + 125, 17 + + + + 149, 22 + + + Copy Color + + + 149, 22 + + + Paste Color + + + 149, 22 + + + Restore Color + + + 149, 22 + + + Add Color + + + 149, 22 + + + Remove Color + + + 150, 114 + + + ColorContextMenu + + + MetroFramework.Controls.MetroContextMenu, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + Fill + + + 0, 0 + + + 4, 4, 4, 4 + + + 374, 496 + + + + 0 + + + colorTreeView + + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + colorsTab + + + 0 + + + 4, 38 + + + 4, 4, 4, 4 + + + 374, 496 + + + 0 + + + Everything + + + colorsTab + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl + + + 0 + + + Fill + + + 0, 0 + + + 4, 4, 4, 4 + + + No + + + 374, 496 + + + 0 + + + waterTreeView + + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + waterTab + + + 0 + + + 4, 38 + + + 4, 4, 4, 4 + + + 374, 496 + + + 1 + + + Water + + + waterTab + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl + + + 1 + + + 0, 0 + + + 4, 4, 4, 4 + + + 372, 488 + + + 0 + + + underwaterTreeView + + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + underwaterTab + + + 0 + + + 4, 38 + + + 4, 4, 4, 4 + + + 374, 496 + + + 2 + + + Underwater + + + underwaterTab + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl + + + 2 + + + 0, 0 + + + 4, 4, 4, 4 + + + 372, 488 + + + 0 + + + fogTreeView + + + System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + fogTab + + + 0 + + + 4, 38 + + + 4, 4, 4, 4 + + + 374, 496 + + + 3 + + + Underwater Fog + + + fogTab + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl + + + 3 + + + 13, 32 + + + 4, 4, 4, 4 + + + 382, 538 + + + 22 + + + tabControl + + + MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + + + metroPanel1 + + + 0 + - - 85, 1 + 134, 2 4, 4, 4, 4 - 13, 13 + 21, 21 - 0 @@ -139,7 +421,7 @@ False - 118, 31 + 589, 32 4, 4, 4, 4 @@ -160,13 +442,13 @@ metroPanel1 - 2 + 3 True - 73, 31 + 544, 32 4, 0, 4, 0 @@ -190,7 +472,7 @@ metroPanel1 - 3 + 4 466, 334 @@ -217,7 +499,7 @@ metroPanel1 - 4 + 5 466, 458 @@ -241,7 +523,7 @@ metroPanel1 - 5 + 6 466, 428 @@ -265,7 +547,7 @@ metroPanel1 - 6 + 7 466, 398 @@ -289,7 +571,7 @@ metroPanel1 - 7 + 8 466, 368 @@ -316,7 +598,7 @@ metroPanel1 - 8 + 9 True @@ -349,7 +631,7 @@ metroPanel1 - 9 + 10 True @@ -379,7 +661,7 @@ metroPanel1 - 10 + 11 True @@ -409,7 +691,7 @@ metroPanel1 - 11 + 12 True @@ -439,7 +721,7 @@ metroPanel1 - 12 + 13 @@ -448,13 +730,13 @@ NoControl - 78, 1 + 122, 2 4, 4, 4, 4 - 13, 13 + 21, 21 0 @@ -484,7 +766,7 @@ metroPanel1 - 13 + 14 True @@ -514,7 +796,7 @@ metroPanel1 - 14 + 15 441, 106 @@ -538,7 +820,7 @@ metroPanel1 - 15 + 16 Fill @@ -565,7 +847,7 @@ $this - 3 + 2 17, 17 @@ -718,288 +1000,6 @@ 1 - - 125, 17 - - - 149, 22 - - - Copy Color - - - 149, 22 - - - Paste Color - - - 149, 22 - - - Restore Color - - - 149, 22 - - - Add Color - - - 149, 22 - - - Remove Color - - - 150, 114 - - - ColorContextMenu - - - MetroFramework.Controls.MetroContextMenu, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - Fill - - - 0, 0 - - - 4, 4, 4, 4 - - - No - - - 374, 496 - - - 0 - - - waterTreeView - - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - waterTab - - - 0 - - - 4, 38 - - - 4, 4, 4, 4 - - - 374, 496 - - - 1 - - - Water - - - waterTab - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 1 - - - 0, 0 - - - 4, 4, 4, 4 - - - 372, 488 - - - 0 - - - underwaterTreeView - - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - underwaterTab - - - 0 - - - 0, 0 - - - 4, 4, 4, 4 - - - 372, 488 - - - 0 - - - fogTreeView - - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - fogTab - - - 0 - - - Fill - - - 0, 0 - - - 4, 4, 4, 4 - - - 374, 496 - - - 0 - - - colorTreeView - - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - colorsTab - - - 0 - - - 4, 38 - - - 4, 4, 4, 4 - - - 374, 496 - - - 0 - - - Everything - - - colorsTab - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 0 - - - Top, Bottom, Left - - - 4, 38 - - - 4, 4, 4, 4 - - - 374, 496 - - - 2 - - - Underwater - - - underwaterTab - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 2 - - - 4, 38 - - - 4, 4, 4, 4 - - - 374, 496 - - - 3 - - - Underwater Fog - - - fogTab - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 3 - - - 27, 131 - - - 4, 4, 4, 4 - - - 382, 538 - - - 22 - - - tabControl - - - MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - $this - - - 2 - True