LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-06-05 18:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Submodule issue

Browse Source
This commit is contained in:
miku-666
2022-12-17 22:57:14 +01:00
parent 1d8772a753
commit b92d9a2d95
10 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -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

2
CrEaTiiOn-Brotherhood-Official-C-Theme

Submodule CrEaTiiOn-Brotherhood-Official-C-Theme updated: c9bc555793...7e7b27c79c

2
PCK-Studio/App.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

21
PCK-Studio/Classes/ToolboxItems/ThemeForm.cs Normal file
View File

@@ -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);
}
}
}

16
PCK-Studio/MainForm.cs
View File

@@ -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;

9
PCK-Studio/PckStudio.csproj
View File

@@ -27,7 +27,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PckStudio</RootNamespace>
<AssemblyName>PCK-Studio</AssemblyName>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<NuGetPackageImportStamp>
@@ -183,6 +183,9 @@
<Compile Include="Classes\IO\Sounds\SoundIO.cs" />
<Compile Include="Classes\IO\Sounds\Sounds.cs" />
<Compile Include="Classes\Models\DefaultModels\Steve64x64Model.cs" />
<Compile Include="Classes\ToolboxItems\ThemeForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Classes\Utils\3DS\3DSUtil.cs" />
<Compile Include="Classes\Utils\ARC\ARCUtil.cs" />
<Compile Include="Classes\Utils\SkinANIM.cs" />
@@ -782,9 +785,9 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CrEaTiiOn-Brotherhood-Official-C-Theme\CBH-Ultimate-Theme-Library-NET-Framework\CBH-Ultimate-Theme-Library-NET-Framework.csproj">
<ProjectReference Include="..\CrEaTiiOn-Brotherhood-Official-C-Theme\Net_Framework_v4.8\Net Framework v4.8.csproj">
<Project>{c3d7b16c-c047-4baa-884f-7a2308619c33}</Project>
<Name>CBH-Ultimate-Theme-Library-NET-Framework</Name>
<Name>Net Framework v4.8</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

4
PCK-Studio/Program.cs
View File

@@ -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);
}

2
PCK-Studio/Properties/Settings.Designer.cs generated
View File

@@ -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())));

4
PCK_Studio.sln
View File

@@ -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

1
SFGraphics

Submodule SFGraphics deleted from ec1c5f0741