diff --git a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs
index 2d7122f1..8f38b52c 100644
--- a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs
+++ b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs
@@ -51,6 +51,8 @@ namespace PckStudio.Forms.Editor
this.saveToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.waterTab = new System.Windows.Forms.TabPage();
this.waterTreeView = new System.Windows.Forms.TreeView();
+ this.ColorContextMenu = new MetroFramework.Controls.MetroContextMenu(this.components);
+ this.restoreOriginalColorToolStripMenuItem = 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();
@@ -58,8 +60,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.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();
@@ -68,11 +68,11 @@ namespace PckStudio.Forms.Editor
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.menuStrip.SuspendLayout();
this.waterTab.SuspendLayout();
+ this.ColorContextMenu.SuspendLayout();
this.colorsTab.SuspendLayout();
this.tabControl.SuspendLayout();
this.underwaterTab.SuspendLayout();
this.fogTab.SuspendLayout();
- this.ColorContextMenu.SuspendLayout();
this.SuspendLayout();
//
// metroPanel1
@@ -265,6 +265,19 @@ namespace PckStudio.Forms.Editor
this.waterTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView2_AfterSelect);
this.waterTreeView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView2_KeyDown);
//
+ // ColorContextMenu
+ //
+ this.ColorContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.restoreOriginalColorToolStripMenuItem});
+ this.ColorContextMenu.Name = "ColorContextMenu";
+ resources.ApplyResources(this.ColorContextMenu, "ColorContextMenu");
+ //
+ // restoreOriginalColorToolStripMenuItem
+ //
+ this.restoreOriginalColorToolStripMenuItem.Name = "restoreOriginalColorToolStripMenuItem";
+ resources.ApplyResources(this.restoreOriginalColorToolStripMenuItem, "restoreOriginalColorToolStripMenuItem");
+ this.restoreOriginalColorToolStripMenuItem.Click += new System.EventHandler(this.restoreOriginalColorToolStripMenuItem_Click);
+ //
// underwaterTreeView
//
this.underwaterTreeView.ContextMenuStrip = this.ColorContextMenu;
@@ -323,20 +336,6 @@ namespace PckStudio.Forms.Editor
resources.ApplyResources(this.fogTab, "fogTab");
this.fogTab.Name = "fogTab";
//
- // ColorContextMenu
- //
- this.ColorContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.restoreOriginalColorToolStripMenuItem});
- this.ColorContextMenu.Name = "ColorContextMenu";
- resources.ApplyResources(this.ColorContextMenu, "ColorContextMenu");
- //
- // restoreOriginalColorToolStripMenuItem
- //
- 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
//
resources.ApplyResources(this, "$this");
@@ -358,11 +357,11 @@ namespace PckStudio.Forms.Editor
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.ColorContextMenu.ResumeLayout(false);
this.ResumeLayout(false);
}
diff --git a/PCK-Studio/Forms/Editor/COLEditor.resx b/PCK-Studio/Forms/Editor/COLEditor.resx
index f3ac1ff3..41b1eb83 100644
--- a/PCK-Studio/Forms/Editor/COLEditor.resx
+++ b/PCK-Studio/Forms/Editor/COLEditor.resx
@@ -117,183 +117,14 @@
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
@@ -510,6 +341,7 @@
10
+
@@ -597,6 +429,30 @@
13
+
+ Fill
+
+
+ 20, 60
+
+
+ 612, 523
+
+
+ 0
+
+
+ metroPanel1
+
+
+ MetroFramework.Controls.MetroPanel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ $this
+
+
+ 3
+
17, 17
@@ -649,39 +505,6 @@
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
-
-
- 0, 0
-
-
- No
-
-
- 320, 458
-
-
- 0
-
waterTreeView
@@ -718,6 +541,51 @@
1
+
+ 125, 17
+
+
+ 187, 26
+
+
+ ColorContextMenu
+
+
+ MetroFramework.Controls.MetroContextMenu, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ Fill
+
+
+ 0, 0
+
+
+ No
+
+
+ 320, 458
+
+
+ 0
+
+
+ waterTreeView
+
+
+ System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ waterTab
+
+
+ 0
+
+
+ 186, 22
+
+
+ Restore original color
+
0, 0
@@ -760,18 +628,6 @@
0
-
- Fill
-
-
- 0, 0
-
-
- 320, 458
-
-
- 0
-
colorTreeView
@@ -808,9 +664,78 @@
0
+
+ Fill
+
+
+ 0, 0
+
+
+ 320, 458
+
+
+ 0
+
+
+ colorTreeView
+
+
+ System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ colorsTab
+
+
+ 0
+
Top, Bottom, Left
+
+ underwaterTab
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl
+
+
+ 2
+
+
+ fogTab
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl
+
+
+ 3
+
+
+ 20, 83
+
+
+ 328, 500
+
+
+ 22
+
+
+ tabControl
+
+
+ MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ $this
+
+
+ 2
+
4, 38
@@ -859,27 +784,6 @@
3
-
- 20, 83
-
-
- 328, 500
-
-
- 22
-
-
- tabControl
-
-
- MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- $this
-
-
- 2
-
True