From b92d9a2d95358b48326abdcfa61107ee64d3d771 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sat, 17 Dec 2022 22:57:14 +0100 Subject: [PATCH] Update Submodule issue --- .gitmodules | 4 ++-- CrEaTiiOn-Brotherhood-Official-C-Theme | 2 +- PCK-Studio/App.config | 2 +- PCK-Studio/Classes/ToolboxItems/ThemeForm.cs | 21 ++++++++++++++++++++ PCK-Studio/MainForm.cs | 16 ++++++--------- PCK-Studio/PckStudio.csproj | 9 ++++++--- PCK-Studio/Program.cs | 4 +--- PCK-Studio/Properties/Settings.Designer.cs | 2 +- PCK_Studio.sln | 4 ++-- SFGraphics | 1 - 10 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 PCK-Studio/Classes/ToolboxItems/ThemeForm.cs delete mode 160000 SFGraphics diff --git a/.gitmodules b/.gitmodules index adabe39e..0259c22d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "CrEaTiiOn-Brotherhood-Official-C-Theme"] +[submodule "Vendor/CrEaTiiOn-Brotherhood-Official-C-Theme"] path = CrEaTiiOn-Brotherhood-Official-C-Theme - url = https://github.com/EternalModz/CrEaTiiOn-Brotherhood-Official-C-Theme + url = https://github.com/EternalModz/CrEaTiiOn-Brotherhood-Official-C-Theme.git diff --git a/CrEaTiiOn-Brotherhood-Official-C-Theme b/CrEaTiiOn-Brotherhood-Official-C-Theme index c9bc5557..7e7b27c7 160000 --- a/CrEaTiiOn-Brotherhood-Official-C-Theme +++ b/CrEaTiiOn-Brotherhood-Official-C-Theme @@ -1 +1 @@ -Subproject commit c9bc555793dd8cfe384368408b5e33482a0d9561 +Subproject commit 7e7b27c79cb20a3cffcf3df4f6b61a95eb165cdc diff --git a/PCK-Studio/App.config b/PCK-Studio/App.config index a96766fd..52bd227b 100644 --- a/PCK-Studio/App.config +++ b/PCK-Studio/App.config @@ -1,7 +1,7 @@ - + diff --git a/PCK-Studio/Classes/ToolboxItems/ThemeForm.cs b/PCK-Studio/Classes/ToolboxItems/ThemeForm.cs new file mode 100644 index 00000000..2aa5e988 --- /dev/null +++ b/PCK-Studio/Classes/ToolboxItems/ThemeForm.cs @@ -0,0 +1,21 @@ +using Dark.Net; +using System.ComponentModel; +using System.Windows.Forms; + +namespace PckStudio.Classes.ToolboxItems +{ + public partial class ThemeForm : Form + { + public ThemeForm() + : base() + { + DarkNet.Instance.SetWindowThemeForms(this, Theme.Auto); + } + + public ThemeForm(IContainer container) + : this() + { + container.Add(this); + } + } +} diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index e4718e9d..e4ebf264 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -22,10 +22,11 @@ using PckStudio.Forms.Editor; using PckStudio.Forms.Additional_Popups.Animation; using PckStudio.Forms.Additional_Popups; using PckStudio.Classes.Misc; +using PckStudio.Classes.ToolboxItems; namespace PckStudio { - public partial class MainForm : Form + public partial class MainForm : ThemeForm { string saveLocation = string.Empty; PCKFile currentPCK = null; @@ -370,15 +371,10 @@ namespace PckStudio private void UpdateRPC() { - if (currentPCK == null) - { - RPC.SetPresence("An Open Source .PCK File Editor", "Program by PhoenixARC"); - return; - }; - - if (TryGetLocFile(out LOCFile locfile) && - locfile.HasLocEntry("IDS_DISPLAY_NAME") && - locfile.Languages.Contains("en-EN")) + if (currentPCK is not null && + TryGetLocFile(out LOCFile locfile) && + locfile.HasLocEntry("IDS_DISPLAY_NAME") && + locfile.Languages.Contains("en-EN")) { RPC.SetPresence($"Editing a Pack: {locfile.GetLocEntry("IDS_DISPLAY_NAME", "en-EN")}", "Program by PhoenixARC"); return; diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index 9d6582a7..1393431c 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -27,7 +27,7 @@ Properties PckStudio PCK-Studio - v4.8.1 + v4.8 512 true @@ -183,6 +183,9 @@ + + Form + @@ -782,9 +785,9 @@ - + {c3d7b16c-c047-4baa-884f-7a2308619c33} - CBH-Ultimate-Theme-Library-NET-Framework + Net Framework v4.8 diff --git a/PCK-Studio/Program.cs b/PCK-Studio/Program.cs index 4156853d..3c0fb890 100644 --- a/PCK-Studio/Program.cs +++ b/PCK-Studio/Program.cs @@ -25,9 +25,7 @@ namespace PckStudio Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); DarkNet.Instance.SetCurrentProcessTheme(Theme.Auto); - - Form mainForm = new MainForm(); - DarkNet.Instance.SetWindowThemeForms(mainForm, Theme.Auto); + MainForm mainForm = new MainForm(); Application.Run(mainForm); } diff --git a/PCK-Studio/Properties/Settings.Designer.cs b/PCK-Studio/Properties/Settings.Designer.cs index 06354b4f..5dcf9f56 100644 --- a/PCK-Studio/Properties/Settings.Designer.cs +++ b/PCK-Studio/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace PckStudio.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/PCK_Studio.sln b/PCK_Studio.sln index 70ba4aed..4e675ca1 100644 --- a/PCK_Studio.sln +++ b/PCK_Studio.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 17.1.32414.318 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCKStudio", "PCK-Studio\PCKStudio.csproj", "{0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Submodules", "Submodules", "{CA7092AE-BF12-4D57-AE25-85E7E6149BE0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vendor", "Vendor", "{CA7092AE-BF12-4D57-AE25-85E7E6149BE0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CBH-Ultimate-Theme-Library-NET-Framework", "CrEaTiiOn-Brotherhood-Official-C-Theme\CBH-Ultimate-Theme-Library-NET-Framework\CBH-Ultimate-Theme-Library-NET-Framework.csproj", "{C3D7B16C-C047-4BAA-884F-7A2308619C33}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net Framework v4.8", "CrEaTiiOn-Brotherhood-Official-C-Theme\Net_Framework_v4.8\Net Framework v4.8.csproj", "{C3D7B16C-C047-4BAA-884F-7A2308619C33}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/SFGraphics b/SFGraphics deleted file mode 160000 index ec1c5f07..00000000 --- a/SFGraphics +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ec1c5f0741722cf6bea29fbe03c6f9226cc4d928