diff --git a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs
index 903df3a0..30338f00 100644
--- a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs
+++ b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs
@@ -73,6 +73,8 @@ namespace PckStudio.Forms.Editor
this.copyColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pasteColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.restoreOriginalColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.addColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.removeColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.underwaterTreeView = new System.Windows.Forms.TreeView();
this.fogTreeView = new System.Windows.Forms.TreeView();
this.colorsTab = new System.Windows.Forms.TabPage();
@@ -80,8 +82,6 @@ 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.addColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.removeColorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.metroPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).BeginInit();
@@ -429,32 +429,49 @@ namespace PckStudio.Forms.Editor
// ColorContextMenu
//
this.ColorContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.addColorToolStripMenuItem,
- this.removeColorToolStripMenuItem,
this.copyColorToolStripMenuItem,
this.pasteColorToolStripMenuItem,
- this.restoreOriginalColorToolStripMenuItem});
+ this.restoreOriginalColorToolStripMenuItem,
+ this.addColorToolStripMenuItem,
+ this.removeColorToolStripMenuItem});
this.ColorContextMenu.Name = "ColorContextMenu";
resources.ApplyResources(this.ColorContextMenu, "ColorContextMenu");
//
// copyColorToolStripMenuItem
//
+ this.copyColorToolStripMenuItem.Image = global::PckStudio.Properties.Resources.file_copy;
this.copyColorToolStripMenuItem.Name = "copyColorToolStripMenuItem";
resources.ApplyResources(this.copyColorToolStripMenuItem, "copyColorToolStripMenuItem");
this.copyColorToolStripMenuItem.Click += new System.EventHandler(this.copyColorToolStripMenuItem_Click);
//
// pasteColorToolStripMenuItem
//
+ this.pasteColorToolStripMenuItem.Image = global::PckStudio.Properties.Resources.file_paste;
this.pasteColorToolStripMenuItem.Name = "pasteColorToolStripMenuItem";
resources.ApplyResources(this.pasteColorToolStripMenuItem, "pasteColorToolStripMenuItem");
this.pasteColorToolStripMenuItem.Click += new System.EventHandler(this.pasteColorToolStripMenuItem_Click);
//
// restoreOriginalColorToolStripMenuItem
//
+ this.restoreOriginalColorToolStripMenuItem.Image = global::PckStudio.Properties.Resources.file_restore;
this.restoreOriginalColorToolStripMenuItem.Name = "restoreOriginalColorToolStripMenuItem";
resources.ApplyResources(this.restoreOriginalColorToolStripMenuItem, "restoreOriginalColorToolStripMenuItem");
this.restoreOriginalColorToolStripMenuItem.Click += new System.EventHandler(this.restoreOriginalColorToolStripMenuItem_Click);
//
+ // addColorToolStripMenuItem
+ //
+ this.addColorToolStripMenuItem.Image = global::PckStudio.Properties.Resources.file_new;
+ this.addColorToolStripMenuItem.Name = "addColorToolStripMenuItem";
+ resources.ApplyResources(this.addColorToolStripMenuItem, "addColorToolStripMenuItem");
+ this.addColorToolStripMenuItem.Click += new System.EventHandler(this.addColorToolStripMenuItem_Click);
+ //
+ // removeColorToolStripMenuItem
+ //
+ this.removeColorToolStripMenuItem.Image = global::PckStudio.Properties.Resources.file_delete;
+ this.removeColorToolStripMenuItem.Name = "removeColorToolStripMenuItem";
+ resources.ApplyResources(this.removeColorToolStripMenuItem, "removeColorToolStripMenuItem");
+ this.removeColorToolStripMenuItem.Click += new System.EventHandler(this.removeColorToolStripMenuItem_Click);
+ //
// underwaterTreeView
//
this.underwaterTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
@@ -519,18 +536,6 @@ namespace PckStudio.Forms.Editor
resources.ApplyResources(this.fogTab, "fogTab");
this.fogTab.Name = "fogTab";
//
- // addColorToolStripMenuItem
- //
- this.addColorToolStripMenuItem.Name = "addColorToolStripMenuItem";
- resources.ApplyResources(this.addColorToolStripMenuItem, "addColorToolStripMenuItem");
- this.addColorToolStripMenuItem.Click += new System.EventHandler(this.addColorToolStripMenuItem_Click);
- //
- // removeColorToolStripMenuItem
- //
- this.removeColorToolStripMenuItem.Name = "removeColorToolStripMenuItem";
- resources.ApplyResources(this.removeColorToolStripMenuItem, "removeColorToolStripMenuItem");
- this.removeColorToolStripMenuItem.Click += new System.EventHandler(this.removeColorToolStripMenuItem_Click);
- //
// COLEditor
//
resources.ApplyResources(this, "$this");
diff --git a/PCK-Studio/Forms/Editor/COLEditor.cs b/PCK-Studio/Forms/Editor/COLEditor.cs
index e08943c0..5c9bfb10 100644
--- a/PCK-Studio/Forms/Editor/COLEditor.cs
+++ b/PCK-Studio/Forms/Editor/COLEditor.cs
@@ -172,14 +172,12 @@ namespace PckStudio.Forms.Editor
{
if(add)
{
- //alphaUpDown.ValueChanged += color_ValueChanged;
redUpDown.ValueChanged += color_ValueChanged;
greenUpDown.ValueChanged += color_ValueChanged;
blueUpDown.ValueChanged += color_ValueChanged;
}
else
{
- //alphaUpDown.ValueChanged -= color_ValueChanged;
redUpDown.ValueChanged -= color_ValueChanged;
greenUpDown.ValueChanged -= color_ValueChanged;
blueUpDown.ValueChanged -= color_ValueChanged;
@@ -191,7 +189,10 @@ namespace PckStudio.Forms.Editor
if (colorTreeView.SelectedNode.Tag == null)
return;
- waterTreeView.SelectedNode = null;
+ addColorToolStripMenuItem.Visible = true;
+ removeColorToolStripMenuItem.Visible = true;
+
+ waterTreeView.SelectedNode = null;
underwaterTreeView.SelectedNode = null;
fogTreeView.SelectedNode = null;
@@ -213,6 +214,9 @@ namespace PckStudio.Forms.Editor
if (waterTreeView.SelectedNode.Tag == null)
return;
+ addColorToolStripMenuItem.Visible = false;
+ removeColorToolStripMenuItem.Visible = false;
+
colorTreeView.SelectedNode = null;
underwaterTreeView.SelectedNode = null;
fogTreeView.SelectedNode = null;
@@ -237,7 +241,10 @@ namespace PckStudio.Forms.Editor
if (underwaterTreeView.SelectedNode.Tag == null)
return;
- colorTreeView.SelectedNode = null;
+ addColorToolStripMenuItem.Visible = false;
+ removeColorToolStripMenuItem.Visible = false;
+
+ colorTreeView.SelectedNode = null;
waterTreeView.SelectedNode = null;
fogTreeView.SelectedNode = null;
@@ -259,7 +266,10 @@ namespace PckStudio.Forms.Editor
if (fogTreeView.SelectedNode.Tag == null)
return;
- colorTreeView.SelectedNode = null;
+ addColorToolStripMenuItem.Visible = false;
+ removeColorToolStripMenuItem.Visible = false;
+
+ colorTreeView.SelectedNode = null;
waterTreeView.SelectedNode = null;
underwaterTreeView.SelectedNode = null;
diff --git a/PCK-Studio/Forms/Editor/COLEditor.resx b/PCK-Studio/Forms/Editor/COLEditor.resx
index 9f104911..bce61f42 100644
--- a/PCK-Studio/Forms/Editor/COLEditor.resx
+++ b/PCK-Studio/Forms/Editor/COLEditor.resx
@@ -117,210 +117,18 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- metroTextBox1
-
-
- MetroFramework.Controls.MetroTextBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- metroPanel1
-
-
- 2
-
-
- metroLabel2
-
-
- MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- metroPanel1
-
-
- 3
-
-
- setColorBtn
-
-
- MetroFramework.Controls.MetroButton, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- metroPanel1
-
-
- 4
-
-
- blueUpDown
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- metroPanel1
-
-
- 5
-
-
- greenUpDown
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- metroPanel1
-
-
- 6
-
-
- redUpDown
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- metroPanel1
-
-
- 7
-
-
- alphaUpDown
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- metroPanel1
-
-
- 8
-
-
- alphaLabel
-
-
- MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- metroPanel1
-
-
- 9
-
-
- blueLabel
-
-
- MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- metroPanel1
-
-
- 10
-
-
- greenLabel
-
-
- MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- metroPanel1
-
-
- 11
-
-
- redLabel
-
-
- MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- metroPanel1
-
-
- 12
-
-
- colorTextbox
-
-
- MetroFramework.Controls.MetroTextBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- metroPanel1
-
-
- 13
-
-
- metroLabel1
-
-
- MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- metroPanel1
-
-
- 14
-
-
- pictureBox1
-
-
- System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- metroPanel1
-
-
- 15
-
-
- Fill
-
-
-
- 20, 60
-
-
- 612, 523
-
-
-
- 0
-
-
- metroPanel1
-
-
- MetroFramework.Controls.MetroPanel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- $this
-
-
- 3
-
+
113, 1
21, 21
+
0
@@ -684,42 +492,36 @@
15
+
+ Fill
+
+
+ 20, 60
+
+
+ 612, 523
+
+
+ 0
+
+
+ metroPanel1
+
+
+ MetroFramework.Controls.MetroPanel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ $this
+
+
+ 3
+
17, 17
False
-
- 20, 60
-
-
- 612, 24
-
-
- 3
-
-
- menuStrip1
-
-
- menuStrip
-
-
- System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 1
-
-
- 37, 20
-
-
- File
-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -736,11 +538,11 @@
Save
-
- 47, 20
+
+ 37, 20
-
- Tools
+
+ File
213, 22
@@ -748,12 +550,6 @@
Remove PS4 Biome Colors
-
- 213, 22
-
-
- Target Update
-
416, 22
@@ -832,41 +628,77 @@
1.91 (PS4)
+
+ 213, 22
+
+
+ Target Update
+
+
+ 47, 20
+
+
+ Tools
+
+
+ 20, 60
+
+
+ 612, 24
+
+
+ 3
+
+
+ menuStrip1
+
+
+ menuStrip
+
+
+ System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 1
+
125, 17
-
- 180, 22
-
-
- Add Color
-
-
- 180, 22
-
-
- Remove Color
-
- 180, 22
+ 149, 22
Copy Color
- 180, 22
+ 149, 22
Paste Color
- 180, 22
+ 149, 22
Restore Color
+
+ 149, 22
+
+
+ Add Color
+
+
+ 149, 22
+
+
+ Remove Color
+
- 181, 136
+ 150, 114
ColorContextMenu