From 7acfefa581abb3b9c7c2af19df7c85378fbae8f8 Mon Sep 17 00:00:00 2001 From: EternalModz <86510009+EternalModz@users.noreply.github.com> Date: Thu, 22 May 2025 12:26:32 -0700 Subject: [PATCH] Minor coloring fixes for the COL Editor --- PCK-Studio/Forms/Editor/COLEditor.Designer.cs | 11 +- PCK-Studio/Forms/Editor/COLEditor.resx | 288 ++++++------------ PCK-Studio/Forms/Editor/LOCEditor.cs | 2 +- PCK-Studio/Forms/Editor/LOCEditor.resx | 2 +- 4 files changed, 105 insertions(+), 198 deletions(-) diff --git a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs index 1f76838d..d7aee4c2 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs @@ -454,7 +454,7 @@ namespace PckStudio.Forms.Editor // // colorTreeView // - this.colorTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.colorTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.colorTreeView.ContextMenuStrip = this.ColorContextMenu; resources.ApplyResources(this.colorTreeView, "colorTreeView"); this.colorTreeView.ForeColor = System.Drawing.Color.White; @@ -471,7 +471,8 @@ namespace PckStudio.Forms.Editor // // waterTreeView // - this.waterTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.waterTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + this.waterTreeView.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.waterTreeView.ContextMenuStrip = this.ColorContextMenu; resources.ApplyResources(this.waterTreeView, "waterTreeView"); this.waterTreeView.ForeColor = System.Drawing.Color.White; @@ -488,7 +489,8 @@ namespace PckStudio.Forms.Editor // // underwaterTreeView // - this.underwaterTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.underwaterTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + 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"); @@ -505,7 +507,8 @@ namespace PckStudio.Forms.Editor // // fogTreeView // - this.fogTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fogTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); + this.fogTreeView.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.fogTreeView.ContextMenuStrip = this.ColorContextMenu; this.fogTreeView.ForeColor = System.Drawing.Color.White; resources.ApplyResources(this.fogTreeView, "fogTreeView"); diff --git a/PCK-Studio/Forms/Editor/COLEditor.resx b/PCK-Studio/Forms/Editor/COLEditor.resx index 9a33d1bc..f9bacd9c 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.resx +++ b/PCK-Studio/Forms/Editor/COLEditor.resx @@ -121,15 +121,6 @@ 125, 17 - - 150, 114 - - - ColorContextMenu - - - MetroFramework.Controls.MetroContextMenu, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - 149, 22 @@ -160,6 +151,15 @@ Remove Color + + 150, 114 + + + ColorContextMenu + + + MetroFramework.Controls.MetroContextMenu, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a + 17, 17 @@ -167,40 +167,6 @@ False - - 0, 0 - - - - 7, 2, 0, 2 - - - 749, 28 - - - 3 - - - menuStrip1 - - - menuStrip - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - 37, 24 - - - File - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -217,11 +183,11 @@ Save - - 47, 24 + + 37, 24 - - Tools + + File 213, 22 @@ -229,12 +195,6 @@ Remove PS4 Biome Colors - - 213, 22 - - - Target Update - 416, 22 @@ -313,6 +273,46 @@ 1.91 (PS4) + + 213, 22 + + + Target Update + + + 47, 24 + + + Tools + + + 0, 0 + + + + 7, 2, 0, 2 + + + 749, 28 + + + 3 + + + menuStrip1 + + + menuStrip + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + NoControl @@ -742,77 +742,20 @@ Top, Bottom, Left - - colorsTab + + Fill - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 - - tabControl - - - 0 - - - waterTab - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl - - - 1 - - - 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 - - - 26, 32 - - + 4, 4, 4, 4 - - 428, 467 + + 420, 425 - - 22 - - - tabControl - - - MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - - metroPanel1 - - - 3 + + 0 colorTreeView @@ -853,31 +796,22 @@ 0 - + Fill - + 0, 0 - + 4, 4, 4, 4 - + + No + + 420, 425 - - 0 - - - colorTreeView - - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - colorsTab - - + 0 @@ -919,34 +853,16 @@ 1 - - Fill - - + 0, 0 - + 4, 4, 4, 4 - - No + + 420, 488 - - 420, 425 - - - 0 - - - waterTreeView - - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - waterTab - - + 0 @@ -988,28 +904,16 @@ 2 - + 0, 0 - + 4, 4, 4, 4 - - 372, 488 + + 420, 488 - - 0 - - - underwaterTreeView - - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - underwaterTab - - + 0 @@ -1051,29 +955,29 @@ 3 - - 0, 0 + + 26, 32 - + 4, 4, 4, 4 - - 372, 488 + + 428, 467 - - 0 + + 22 - - fogTreeView + + tabControl - - System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a - - fogTab + + metroPanel1 - - 0 + + 3 631, 473 @@ -1100,7 +1004,7 @@ metroPanel1 - 0 + 2 Fill diff --git a/PCK-Studio/Forms/Editor/LOCEditor.cs b/PCK-Studio/Forms/Editor/LOCEditor.cs index e1d7017d..2e9a93d6 100644 --- a/PCK-Studio/Forms/Editor/LOCEditor.cs +++ b/PCK-Studio/Forms/Editor/LOCEditor.cs @@ -17,7 +17,7 @@ namespace PckStudio.Forms.Editor { LOCFile _currentLoc; PckAsset _asset; - private bool _isModified = false; // Track changes to the LOC strings + private bool _isModified = false; // Track string changes public LOCEditor(PckAsset asset) { diff --git a/PCK-Studio/Forms/Editor/LOCEditor.resx b/PCK-Studio/Forms/Editor/LOCEditor.resx index 25a5f709..81f62900 100644 --- a/PCK-Studio/Forms/Editor/LOCEditor.resx +++ b/PCK-Studio/Forms/Editor/LOCEditor.resx @@ -361,7 +361,7 @@ 2 - 180, 22 + 98, 22 Save