diff --git a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs
index 73505654..2d7122f1 100644
--- a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs
+++ b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs
@@ -31,14 +31,20 @@ namespace PckStudio.Forms.Editor
///
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(COLEditor));
this.metroPanel1 = new MetroFramework.Controls.MetroPanel();
this.setColorBtn = new MetroFramework.Controls.MetroButton();
+ this.blueUpDown = new System.Windows.Forms.NumericUpDown();
+ this.greenUpDown = new System.Windows.Forms.NumericUpDown();
+ this.redUpDown = new System.Windows.Forms.NumericUpDown();
this.alphaUpDown = new System.Windows.Forms.NumericUpDown();
this.alphaLabel = new MetroFramework.Controls.MetroLabel();
this.blueLabel = new MetroFramework.Controls.MetroLabel();
this.greenLabel = new MetroFramework.Controls.MetroLabel();
this.redLabel = new MetroFramework.Controls.MetroLabel();
+ this.colorTextbox = new MetroFramework.Controls.MetroTextBox();
+ this.metroLabel1 = new MetroFramework.Controls.MetroLabel();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.menuStrip = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -52,12 +58,12 @@ namespace PckStudio.Forms.Editor
this.tabControl = new MetroFramework.Controls.MetroTabControl();
this.underwaterTab = new System.Windows.Forms.TabPage();
this.fogTab = new System.Windows.Forms.TabPage();
- this.redUpDown = new System.Windows.Forms.NumericUpDown();
- this.greenUpDown = new System.Windows.Forms.NumericUpDown();
- this.blueUpDown = new System.Windows.Forms.NumericUpDown();
- this.colorTextbox = new MetroFramework.Controls.MetroTextBox();
- this.metroLabel1 = new MetroFramework.Controls.MetroLabel();
+ this.ColorContextMenu = new MetroFramework.Controls.MetroContextMenu(this.components);
+ this.restoreOriginalColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.metroPanel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.redUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.alphaUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.menuStrip.SuspendLayout();
@@ -66,9 +72,7 @@ namespace PckStudio.Forms.Editor
this.tabControl.SuspendLayout();
this.underwaterTab.SuspendLayout();
this.fogTab.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.redUpDown)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).BeginInit();
+ this.ColorContextMenu.SuspendLayout();
this.SuspendLayout();
//
// metroPanel1
@@ -104,6 +108,45 @@ namespace PckStudio.Forms.Editor
this.setColorBtn.UseSelectable = true;
this.setColorBtn.Click += new System.EventHandler(this.setColorBtn_Click);
//
+ // blueUpDown
+ //
+ this.blueUpDown.BackColor = System.Drawing.SystemColors.Desktop;
+ this.blueUpDown.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204)))));
+ resources.ApplyResources(this.blueUpDown, "blueUpDown");
+ this.blueUpDown.Maximum = new decimal(new int[] {
+ 255,
+ 0,
+ 0,
+ 0});
+ this.blueUpDown.Name = "blueUpDown";
+ this.blueUpDown.ValueChanged += new System.EventHandler(this.color_ValueChanged);
+ //
+ // greenUpDown
+ //
+ this.greenUpDown.BackColor = System.Drawing.SystemColors.Desktop;
+ this.greenUpDown.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204)))));
+ resources.ApplyResources(this.greenUpDown, "greenUpDown");
+ this.greenUpDown.Maximum = new decimal(new int[] {
+ 255,
+ 0,
+ 0,
+ 0});
+ this.greenUpDown.Name = "greenUpDown";
+ this.greenUpDown.ValueChanged += new System.EventHandler(this.color_ValueChanged);
+ //
+ // redUpDown
+ //
+ this.redUpDown.BackColor = System.Drawing.SystemColors.Desktop;
+ this.redUpDown.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204)))));
+ resources.ApplyResources(this.redUpDown, "redUpDown");
+ this.redUpDown.Maximum = new decimal(new int[] {
+ 255,
+ 0,
+ 0,
+ 0});
+ this.redUpDown.Name = "redUpDown";
+ this.redUpDown.ValueChanged += new System.EventHandler(this.color_ValueChanged);
+ //
// alphaUpDown
//
this.alphaUpDown.BackColor = System.Drawing.SystemColors.Desktop;
@@ -141,6 +184,43 @@ namespace PckStudio.Forms.Editor
this.redLabel.Name = "redLabel";
this.redLabel.Theme = MetroFramework.MetroThemeStyle.Dark;
//
+ // colorTextbox
+ //
+ //
+ //
+ //
+ this.colorTextbox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image")));
+ this.colorTextbox.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode")));
+ this.colorTextbox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location")));
+ this.colorTextbox.CustomButton.Name = "";
+ this.colorTextbox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size")));
+ this.colorTextbox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue;
+ this.colorTextbox.CustomButton.TabIndex = ((int)(resources.GetObject("resource.TabIndex")));
+ this.colorTextbox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light;
+ this.colorTextbox.CustomButton.UseSelectable = true;
+ this.colorTextbox.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible")));
+ this.colorTextbox.Lines = new string[0];
+ resources.ApplyResources(this.colorTextbox, "colorTextbox");
+ this.colorTextbox.MaxLength = 32767;
+ this.colorTextbox.Name = "colorTextbox";
+ this.colorTextbox.PasswordChar = '\0';
+ this.colorTextbox.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.colorTextbox.SelectedText = "";
+ this.colorTextbox.SelectionLength = 0;
+ this.colorTextbox.SelectionStart = 0;
+ this.colorTextbox.ShortcutsEnabled = true;
+ this.colorTextbox.Theme = MetroFramework.MetroThemeStyle.Dark;
+ this.colorTextbox.UseSelectable = true;
+ this.colorTextbox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ this.colorTextbox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel);
+ this.colorTextbox.TextChanged += new System.EventHandler(this.colorBox_TextChanged);
+ //
+ // metroLabel1
+ //
+ resources.ApplyResources(this.metroLabel1, "metroLabel1");
+ this.metroLabel1.Name = "metroLabel1";
+ this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark;
+ //
// pictureBox1
//
this.pictureBox1.BackColor = System.Drawing.Color.Gray;
@@ -179,6 +259,7 @@ namespace PckStudio.Forms.Editor
//
// waterTreeView
//
+ this.waterTreeView.ContextMenuStrip = this.ColorContextMenu;
resources.ApplyResources(this.waterTreeView, "waterTreeView");
this.waterTreeView.Name = "waterTreeView";
this.waterTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView2_AfterSelect);
@@ -186,6 +267,7 @@ namespace PckStudio.Forms.Editor
//
// underwaterTreeView
//
+ this.underwaterTreeView.ContextMenuStrip = this.ColorContextMenu;
resources.ApplyResources(this.underwaterTreeView, "underwaterTreeView");
this.underwaterTreeView.Name = "underwaterTreeView";
this.underwaterTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView3_AfterSelect);
@@ -193,6 +275,7 @@ namespace PckStudio.Forms.Editor
//
// fogTreeView
//
+ this.fogTreeView.ContextMenuStrip = this.ColorContextMenu;
resources.ApplyResources(this.fogTreeView, "fogTreeView");
this.fogTreeView.Name = "fogTreeView";
this.fogTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView4_AfterSelect);
@@ -207,6 +290,7 @@ namespace PckStudio.Forms.Editor
//
// colorTreeView
//
+ this.colorTreeView.ContextMenuStrip = this.ColorContextMenu;
resources.ApplyResources(this.colorTreeView, "colorTreeView");
this.colorTreeView.Name = "colorTreeView";
this.colorTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect);
@@ -239,81 +323,19 @@ namespace PckStudio.Forms.Editor
resources.ApplyResources(this.fogTab, "fogTab");
this.fogTab.Name = "fogTab";
//
- // redUpDown
+ // ColorContextMenu
//
- this.redUpDown.BackColor = System.Drawing.SystemColors.Desktop;
- this.redUpDown.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204)))));
- resources.ApplyResources(this.redUpDown, "redUpDown");
- this.redUpDown.Maximum = new decimal(new int[] {
- 255,
- 0,
- 0,
- 0});
- this.redUpDown.Name = "redUpDown";
- this.redUpDown.ValueChanged += new System.EventHandler(this.color_ValueChanged);
+ this.ColorContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.restoreOriginalColorToolStripMenuItem});
+ this.ColorContextMenu.Name = "ColorContextMenu";
+ resources.ApplyResources(this.ColorContextMenu, "ColorContextMenu");
//
- // greenUpDown
+ // restoreOriginalColorToolStripMenuItem
//
- this.greenUpDown.BackColor = System.Drawing.SystemColors.Desktop;
- this.greenUpDown.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204)))));
- resources.ApplyResources(this.greenUpDown, "greenUpDown");
- this.greenUpDown.Maximum = new decimal(new int[] {
- 255,
- 0,
- 0,
- 0});
- this.greenUpDown.Name = "greenUpDown";
- this.greenUpDown.ValueChanged += new System.EventHandler(this.color_ValueChanged);
- //
- // blueUpDown
- //
- this.blueUpDown.BackColor = System.Drawing.SystemColors.Desktop;
- this.blueUpDown.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204)))));
- resources.ApplyResources(this.blueUpDown, "blueUpDown");
- this.blueUpDown.Maximum = new decimal(new int[] {
- 255,
- 0,
- 0,
- 0});
- this.blueUpDown.Name = "blueUpDown";
- this.blueUpDown.ValueChanged += new System.EventHandler(this.color_ValueChanged);
- //
- // colorTextbox
- //
- //
- //
- //
- this.colorTextbox.CustomButton.Image = ((System.Drawing.Image)(resources.GetObject("resource.Image")));
- this.colorTextbox.CustomButton.ImeMode = ((System.Windows.Forms.ImeMode)(resources.GetObject("resource.ImeMode")));
- this.colorTextbox.CustomButton.Location = ((System.Drawing.Point)(resources.GetObject("resource.Location")));
- this.colorTextbox.CustomButton.Name = "";
- this.colorTextbox.CustomButton.Size = ((System.Drawing.Size)(resources.GetObject("resource.Size")));
- this.colorTextbox.CustomButton.Style = MetroFramework.MetroColorStyle.Blue;
- this.colorTextbox.CustomButton.TabIndex = ((int)(resources.GetObject("resource.TabIndex")));
- this.colorTextbox.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light;
- this.colorTextbox.CustomButton.UseSelectable = true;
- this.colorTextbox.CustomButton.Visible = ((bool)(resources.GetObject("resource.Visible")));
- this.colorTextbox.Lines = new string[0];
- resources.ApplyResources(this.colorTextbox, "colorTextbox");
- this.colorTextbox.MaxLength = 32767;
- this.colorTextbox.Name = "colorTextbox";
- this.colorTextbox.PasswordChar = '\0';
- this.colorTextbox.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.colorTextbox.SelectedText = "";
- this.colorTextbox.SelectionLength = 0;
- this.colorTextbox.SelectionStart = 0;
- this.colorTextbox.ShortcutsEnabled = true;
- this.colorTextbox.Theme = MetroFramework.MetroThemeStyle.Dark;
- this.colorTextbox.UseSelectable = true;
- this.colorTextbox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- this.colorTextbox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel);
- this.colorTextbox.TextChanged += new System.EventHandler(this.colorBox_TextChanged);
- //
- // metroLabel1
- //
- resources.ApplyResources(this.metroLabel1, "metroLabel1");
- this.metroLabel1.Name = "metroLabel1";
- this.metroLabel1.Theme = MetroFramework.MetroThemeStyle.Dark;
+ this.restoreOriginalColorToolStripMenuItem.Image = global::PckStudio.Properties.Resources.ExportFile;
+ this.restoreOriginalColorToolStripMenuItem.Name = "restoreOriginalColorToolStripMenuItem";
+ resources.ApplyResources(this.restoreOriginalColorToolStripMenuItem, "restoreOriginalColorToolStripMenuItem");
+ this.restoreOriginalColorToolStripMenuItem.Click += new System.EventHandler(this.restoreOriginalColorToolStripMenuItem_Click);
//
// COLEditor
//
@@ -328,6 +350,9 @@ namespace PckStudio.Forms.Editor
this.Theme = MetroFramework.MetroThemeStyle.Dark;
this.metroPanel1.ResumeLayout(false);
this.metroPanel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.redUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.alphaUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.menuStrip.ResumeLayout(false);
@@ -337,9 +362,7 @@ namespace PckStudio.Forms.Editor
this.tabControl.ResumeLayout(false);
this.underwaterTab.ResumeLayout(false);
this.fogTab.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.redUpDown)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).EndInit();
+ this.ColorContextMenu.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -371,5 +394,7 @@ namespace PckStudio.Forms.Editor
private NumericUpDown redUpDown;
private MetroFramework.Controls.MetroTextBox colorTextbox;
private MetroFramework.Controls.MetroLabel metroLabel1;
+ private MetroFramework.Controls.MetroContextMenu ColorContextMenu;
+ private ToolStripMenuItem restoreOriginalColorToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/PCK-Studio/Forms/Editor/COLEditor.cs b/PCK-Studio/Forms/Editor/COLEditor.cs
index b9242e99..b6c943ff 100644
--- a/PCK-Studio/Forms/Editor/COLEditor.cs
+++ b/PCK-Studio/Forms/Editor/COLEditor.cs
@@ -153,12 +153,7 @@ namespace PckStudio.Forms.Editor
var node = colorTreeView.SelectedNode;
if (e.KeyCode == Keys.Delete && node.Tag is COLFile.ColorEntry colorInfo)
{
- COLFile.ColorEntry entry = default_colourfile.entries.Find(color => color.name == node.Text);
- colorInfo.color = entry.color;
- redUpDown.Value = entry.color >> 16 & 0xff;
- greenUpDown.Value = entry.color >> 8 & 0xff;
- blueUpDown.Value = entry.color & 0xff;
- pictureBox1.BackColor = Color.FromArgb(0xff << 24 | (int)entry.color);
+ restoreOriginalColorToolStripMenuItem_Click(sender, e);
}
}
@@ -167,13 +162,7 @@ namespace PckStudio.Forms.Editor
var node = waterTreeView.SelectedNode;
if (e.KeyCode == Keys.Delete && node.Tag is COLFile.ExtendedColorEntry colorInfo)
{
- COLFile.ExtendedColorEntry entry = default_colourfile.waterEntries.Find(color => color.name == node.Text);
- colorInfo.color = entry.color;
- alphaUpDown.Value = entry.color >> 24 & 0xff;
- redUpDown.Value = entry.color >> 16 & 0xff;
- greenUpDown.Value = entry.color >> 8 & 0xff;
- blueUpDown.Value = entry.color & 0xff;
- pictureBox1.BackColor = Color.FromArgb((int)entry.color);
+ restoreOriginalColorToolStripMenuItem_Click(sender, e);
}
}
@@ -182,13 +171,7 @@ namespace PckStudio.Forms.Editor
var node = underwaterTreeView.SelectedNode;
if (e.KeyCode == Keys.Delete && node.Tag is COLFile.ExtendedColorEntry colorInfo)
{
- COLFile.ExtendedColorEntry entry = default_colourfile.waterEntries.Find(color => color.name == node.Text);
- colorInfo.color_b = entry.color_b;
- alphaUpDown.Value = entry.color >> 24 & 0xff;
- redUpDown.Value = entry.color >> 16 & 0xff;
- greenUpDown.Value = entry.color >> 8 & 0xff;
- blueUpDown.Value = entry.color & 0xff;
- pictureBox1.BackColor = Color.FromArgb(0xff << 24 | (int)entry.color);
+ restoreOriginalColorToolStripMenuItem_Click(sender, e);
}
}
@@ -197,13 +180,7 @@ namespace PckStudio.Forms.Editor
var node = fogTreeView.SelectedNode;
if (e.KeyCode == Keys.Delete && node.Tag is COLFile.ExtendedColorEntry colorInfo)
{
- COLFile.ExtendedColorEntry entry = default_colourfile.waterEntries.Find(color => color.name == node.Text);
- colorInfo.color_c = entry.color_c;
- alphaUpDown.Value = entry.color >> 24 & 0xff;
- redUpDown.Value = entry.color >> 16 & 0xff;
- greenUpDown.Value = entry.color >> 8 & 0xff;
- blueUpDown.Value = entry.color & 0xff;
- pictureBox1.BackColor = Color.FromArgb(0xff << 24 | (int)entry.color);
+ restoreOriginalColorToolStripMenuItem_Click(sender, e);
}
}
@@ -342,5 +319,56 @@ namespace PckStudio.Forms.Editor
pictureBox1.BackColor = fixed_color;
}
}
+
+ private void restoreOriginalColorToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (tabControl.SelectedTab == colorsTab && colorTreeView.SelectedNode != null &&
+ colorTreeView.SelectedNode.Tag != null && colorTreeView.SelectedNode.Tag is COLFile.ColorEntry colorInfoD)
+ {
+ MessageBox.Show("Color");
+ COLFile.ColorEntry entry = default_colourfile.entries.Find(color => color.name == colorTreeView.SelectedNode.Text);
+ colorInfoD.color = entry.color;
+ redUpDown.Value = colorInfoD.color >> 16 & 0xff;
+ greenUpDown.Value = colorInfoD.color >> 8 & 0xff;
+ blueUpDown.Value = colorInfoD.color & 0xff;
+ pictureBox1.BackColor = Color.FromArgb(0xff << 24 | (int)colorInfoD.color);
+ }
+ else if (tabControl.SelectedTab == waterTab && waterTreeView.SelectedNode != null &&
+ waterTreeView.SelectedNode.Tag != null && waterTreeView.SelectedNode.Tag is COLFile.ExtendedColorEntry colorInfo)
+ {
+ MessageBox.Show("Water");
+ COLFile.ExtendedColorEntry entry = default_colourfile.waterEntries.Find(color => color.name == waterTreeView.SelectedNode.Text);
+ colorInfo.color = entry.color;
+ alphaUpDown.Value = colorInfo.color >> 24 & 0xff;
+ redUpDown.Value = colorInfo.color >> 16 & 0xff;
+ greenUpDown.Value = colorInfo.color >> 8 & 0xff;
+ blueUpDown.Value = colorInfo.color & 0xff;
+ pictureBox1.BackColor = Color.FromArgb((int)colorInfo.color);
+ }
+ else if (tabControl.SelectedTab == underwaterTab && underwaterTreeView.SelectedNode != null &&
+ underwaterTreeView.SelectedNode.Tag != null && underwaterTreeView.SelectedNode.Tag is COLFile.ExtendedColorEntry colorInfoB)
+ {
+ MessageBox.Show("Underwater");
+ COLFile.ExtendedColorEntry entry = default_colourfile.waterEntries.Find(color => color.name == underwaterTreeView.SelectedNode.Text);
+ colorInfoB.color_b = entry.color_b;
+ alphaUpDown.Value = colorInfoB.color_b >> 24 & 0xff;
+ redUpDown.Value = colorInfoB.color_b >> 16 & 0xff;
+ greenUpDown.Value = colorInfoB.color_b >> 8 & 0xff;
+ blueUpDown.Value = colorInfoB.color_b & 0xff;
+ pictureBox1.BackColor = Color.FromArgb(0xff << 24 | (int)colorInfoB.color_b);
+ }
+ else if (tabControl.SelectedTab == fogTab && fogTreeView.SelectedNode != null &&
+ fogTreeView.SelectedNode.Tag != null && fogTreeView.SelectedNode.Tag is COLFile.ExtendedColorEntry colorInfoC)
+ {
+ MessageBox.Show("Fog");
+ COLFile.ExtendedColorEntry entry = default_colourfile.waterEntries.Find(color => color.name == fogTreeView.SelectedNode.Text);
+ colorInfoC.color_c = entry.color_c;
+ alphaUpDown.Value = colorInfoC.color_c >> 24 & 0xff;
+ redUpDown.Value = colorInfoC.color_c >> 16 & 0xff;
+ greenUpDown.Value = colorInfoC.color_c >> 8 & 0xff;
+ blueUpDown.Value = colorInfoC.color_c & 0xff;
+ pictureBox1.BackColor = Color.FromArgb(0xff << 24 | (int)colorInfoC.color_c);
+ }
+ }
}
}
diff --git a/PCK-Studio/Forms/Editor/COLEditor.resx b/PCK-Studio/Forms/Editor/COLEditor.resx
index 77fcbaa3..f3ac1ff3 100644
--- a/PCK-Studio/Forms/Editor/COLEditor.resx
+++ b/PCK-Studio/Forms/Editor/COLEditor.resx
@@ -117,14 +117,183 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ setColorBtn
+
+
+ MetroFramework.Controls.MetroButton, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 2
+
+
+ blueUpDown
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ metroPanel1
+
+
+ 3
+
+
+ greenUpDown
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ metroPanel1
+
+
+ 4
+
+
+ redUpDown
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ metroPanel1
+
+
+ 5
+
+
+ alphaUpDown
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ metroPanel1
+
+
+ 6
+
+
+ alphaLabel
+
+
+ MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 7
+
+
+ blueLabel
+
+
+ MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 8
+
+
+ greenLabel
+
+
+ MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 9
+
+
+ redLabel
+
+
+ MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 10
+
+
+ colorTextbox
+
+
+ MetroFramework.Controls.MetroTextBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 11
+
+
+ metroLabel1
+
+
+ MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 12
+
+
+ pictureBox1
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ metroPanel1
+
+
+ 13
+
+
+
+ Fill
+
+
+ 20, 60
+
+
+ 612, 523
+
+
+
+ 0
+
+
+ metroPanel1
+
+
+ MetroFramework.Controls.MetroPanel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ $this
+
+
+ 3
+
400, 290
125, 23
-
22
@@ -341,7 +510,6 @@
10
-
@@ -429,58 +597,12 @@
13
-
- Fill
-
-
- 20, 60
-
-
- 612, 523
-
-
- 0
-
-
- metroPanel1
-
-
- MetroFramework.Controls.MetroPanel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- $this
-
-
- 2
-
17, 17
False
-
-
- 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
-
-
-
- 98, 22
-
-
- Save
-
-
- 37, 20
-
-
- File
-
20, 60
@@ -503,7 +625,47 @@
$this
- 0
+ 1
+
+
+ 37, 20
+
+
+ File
+
+
+
+ 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
+
+
+
+ 98, 22
+
+
+ Save
+
+
+ 125, 17
+
+
+ 186, 22
+
+
+ Restore original color
+
+
+ 187, 48
+
+
+ ColorContextMenu
+
+
+ MetroFramework.Controls.MetroContextMenu, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
Fill
@@ -716,7 +878,7 @@
$this
- 1
+ 2
True
@@ -3254,6 +3416,12 @@
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
+
COLEditor