diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2a78b578..0a21f1ae 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -9,8 +9,14 @@ jobs: steps: - uses: actions/checkout@v3 + + - name: Checkout submodules + run: | + git submodule update --init --recursive + - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1 + - name: Setup NuGet uses: NuGet/setup-nuget@v1.0.6 diff --git a/.gitmodules b/.gitmodules index adabe39e..565c3e04 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "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/Classes/ToolboxItems/ThemeForm.cs b/PCK-Studio/Classes/ToolboxItems/ThemeForm.cs new file mode 100644 index 00000000..c78fc71e --- /dev/null +++ b/PCK-Studio/Classes/ToolboxItems/ThemeForm.cs @@ -0,0 +1,21 @@ +using System.ComponentModel; +using System.Windows.Forms; +using Dark.Net; + +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/Classes/FileTypses/COL/ColorBox.cs b/PCK-Studio/Forms/Additional-Popups/Col/ColorBox.cs similarity index 100% rename from PCK-Studio/Classes/FileTypses/COL/ColorBox.cs rename to PCK-Studio/Forms/Additional-Popups/Col/ColorBox.cs diff --git a/PCK-Studio/Classes/FileTypses/COL/ColorBox.designer.cs b/PCK-Studio/Forms/Additional-Popups/Col/ColorBox.designer.cs similarity index 100% rename from PCK-Studio/Classes/FileTypses/COL/ColorBox.designer.cs rename to PCK-Studio/Forms/Additional-Popups/Col/ColorBox.designer.cs diff --git a/PCK-Studio/Classes/FileTypses/COL/ColorBox.resx b/PCK-Studio/Forms/Additional-Popups/Col/ColorBox.resx similarity index 100% rename from PCK-Studio/Classes/FileTypses/COL/ColorBox.resx rename to PCK-Studio/Forms/Additional-Popups/Col/ColorBox.resx diff --git a/PCK-Studio/Classes/FileTypses/COL/ColorUtil.cs b/PCK-Studio/Forms/Additional-Popups/Col/ColorUtil.cs similarity index 100% rename from PCK-Studio/Classes/FileTypses/COL/ColorUtil.cs rename to PCK-Studio/Forms/Additional-Popups/Col/ColorUtil.cs diff --git a/PCK-Studio/Classes/FileTypses/COL/DrawStyles.cs b/PCK-Studio/Forms/Additional-Popups/Col/DrawStyles.cs similarity index 100% rename from PCK-Studio/Classes/FileTypses/COL/DrawStyles.cs rename to PCK-Studio/Forms/Additional-Popups/Col/DrawStyles.cs diff --git a/PCK-Studio/Classes/FileTypses/COL/NumericTextBox.cs b/PCK-Studio/Forms/Additional-Popups/Col/NumericTextBox.cs similarity index 100% rename from PCK-Studio/Classes/FileTypses/COL/NumericTextBox.cs rename to PCK-Studio/Forms/Additional-Popups/Col/NumericTextBox.cs diff --git a/PCK-Studio/Classes/FileTypses/COL/TwoColorPanel.cs b/PCK-Studio/Forms/Additional-Popups/Col/TwoColorPanel.cs similarity index 100% rename from PCK-Studio/Classes/FileTypses/COL/TwoColorPanel.cs rename to PCK-Studio/Forms/Additional-Popups/Col/TwoColorPanel.cs diff --git a/PCK-Studio/Classes/FileTypses/COL/TwoColorPanel.designer.cs b/PCK-Studio/Forms/Additional-Popups/Col/TwoColorPanel.designer.cs similarity index 100% rename from PCK-Studio/Classes/FileTypses/COL/TwoColorPanel.designer.cs rename to PCK-Studio/Forms/Additional-Popups/Col/TwoColorPanel.designer.cs diff --git a/PCK-Studio/Classes/FileTypses/COL/VerticalColorSlider.cs b/PCK-Studio/Forms/Additional-Popups/Col/VerticalColorSlider.cs similarity index 100% rename from PCK-Studio/Classes/FileTypses/COL/VerticalColorSlider.cs rename to PCK-Studio/Forms/Additional-Popups/Col/VerticalColorSlider.cs diff --git a/PCK-Studio/Classes/FileTypses/COL/VerticalColorSlider.designer.cs b/PCK-Studio/Forms/Additional-Popups/Col/VerticalColorSlider.designer.cs similarity index 100% rename from PCK-Studio/Classes/FileTypses/COL/VerticalColorSlider.designer.cs rename to PCK-Studio/Forms/Additional-Popups/Col/VerticalColorSlider.designer.cs diff --git a/PCK-Studio/Classes/FileTypses/COL/VerticalColorSlider.resx b/PCK-Studio/Forms/Additional-Popups/Col/VerticalColorSlider.resx similarity index 100% rename from PCK-Studio/Classes/FileTypses/COL/VerticalColorSlider.resx rename to PCK-Studio/Forms/Additional-Popups/Col/VerticalColorSlider.resx diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index e4718e9d..e580178f 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; @@ -300,7 +301,7 @@ namespace PckStudio private void BuildMainTreeView() { // In case the Rename function was just used and the selected node name no longer matches the file name - string filepath = ""; + string filepath = string.Empty; if(treeViewMain.SelectedNode is TreeNode node && node.Tag is PCKFile.FileData file) filepath = file.filepath; treeViewMain.Nodes.Clear(); @@ -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; @@ -826,18 +822,17 @@ namespace PckStudio } } - bool IsSubPCKNode(string nodePath) + bool IsSubPCKNode(string nodePath, string extention = ".pck") { // written by miku, implemented and modified by me - MNL + if (nodePath.EndsWith(extention)) return false; + string[] subpaths = nodePath.Split('/'); - string[] conditions = subpaths.Select(s => Path.GetExtension(s) switch { - ".pck" => "yes", - _ => "no", - }).ToArray(); + var conditions = subpaths.Select(s => Path.GetExtension(s).Equals(extention)); - bool isSubFile = conditions.Contains("yes") && !nodePath.EndsWith(".pck"); + bool isSubFile = conditions.Contains(true); - Console.WriteLine(nodePath + " is " + (isSubFile ? "" : "not ") + "a Sub-PCK File"); + Console.WriteLine($"{nodePath} is{(isSubFile ? "" : " not")} a Sub-PCK File"); return isSubFile; } @@ -864,19 +859,16 @@ namespace PckStudio TreeNode GetSubPCK(TreeNode child) { TreeNode parent = child; - - bool flag = false; - while (parent.Parent != null) { parent = parent.Parent; Console.WriteLine(parent.Text); - flag = parent.Tag is PCKFile.FileData f && (f.filetype is PCKFile.FileData.FileType.TexturePackInfoFile || f.filetype is PCKFile.FileData.FileType.SkinDataFile); - if (flag) break; + if (parent.Tag is PCKFile.FileData f && + (f.filetype is PCKFile.FileData.FileType.TexturePackInfoFile || + f.filetype is PCKFile.FileData.FileType.SkinDataFile)) + return parent; } - - if (!flag) return null; - else return parent; + return null; } void RebuildSubPCK(TreeNode childNode) @@ -894,9 +886,8 @@ namespace PckStudio foreach (TreeNode node in GetNodes(parent.Nodes)) { - if (node.Tag is PCKFile.FileData) + if (node.Tag is PCKFile.FileData node_file) { - PCKFile.FileData node_file = (PCKFile.FileData)node.Tag; PCKFile.FileData new_file = new PCKFile.FileData(node_file.filepath, node_file.filetype); foreach (var prop in node_file.properties) new_file.properties.Add(prop); new_file.SetData(node_file.data); @@ -904,12 +895,15 @@ namespace PckStudio } } - MemoryStream ms = new MemoryStream(); // Bool to add the XMLVersion property bool isSkinsPCK = parent_file.filetype is PCKFile.FileData.FileType.SkinDataFile; + + using (MemoryStream ms = new MemoryStream()) + { PCKFileWriter.Write(ms, newPCKFile, LittleEndianCheckBox.Checked, isSkinsPCK); parent_file.SetData(ms.ToArray()); parent.Tag = parent_file; + } BuildMainTreeView(); } @@ -934,61 +928,70 @@ namespace PckStudio private void treeMeta_DoubleClick(object sender, EventArgs e) { - if (treeMeta.SelectedNode == null || !(treeMeta.SelectedNode.Tag is ValueTuple) || - treeViewMain.SelectedNode == null || !(treeViewMain.SelectedNode.Tag is PCKFile.FileData)) - return; - PCKFile.FileData file = (PCKFile.FileData)treeViewMain.SelectedNode.Tag; - var property = (ValueTuple)treeMeta.SelectedNode.Tag; - int i = file.properties.IndexOf(property); - if (property.Item1 == "ANIM" && i != -1 && file.filetype == PCKFile.FileData.FileType.SkinFile) + if (treeMeta.SelectedNode is TreeNode subnode && subnode.Tag is ValueTuple property && + treeViewMain.SelectedNode is TreeNode node && node.Tag is PCKFile.FileData file) { - using ANIMEditor diag = new ANIMEditor(property.Item2); - try + int i = file.properties.IndexOf(property); + if (i != -1) { - if (diag.ShowDialog(this) == DialogResult.OK && diag.saved) + switch (property.Item1) { - file.properties[i] = new ValueTuple("ANIM", diag.outANIM); - if (IsSubPCKNode(treeViewMain.SelectedNode.FullPath)) RebuildSubPCK(treeViewMain.SelectedNode); - ReloadMetaTreeView(); - saved = false; + case "ANIM" when file.filetype == PCKFile.FileData.FileType.SkinFile: + try + { + using ANIMEditor diag = new ANIMEditor(property.Item2); + if (diag.ShowDialog(this) == DialogResult.OK && diag.saved) + { + file.properties[i] = ("ANIM", diag.outANIM); + if (IsSubPCKNode(treeViewMain.SelectedNode.FullPath)) + RebuildSubPCK(treeViewMain.SelectedNode); + ReloadMetaTreeView(); + saved = false; + } + return; + } + catch (Exception ex) + { + Debug.WriteLine(ex.Message); + MessageBox.Show("Failed to parse ANIM value, aborting to normal functionality. Please make sure the value only includes hexadecimal characters (0-9,A-F) and has no more than 8 characters. It can have an optional prefix of \"0x\"."); + } + break; + + case "BOX" when file.filetype == PCKFile.FileData.FileType.SkinFile: + try + { + using BoxEditor diag = new BoxEditor(property.Item2, IsSubPCKNode(treeViewMain.SelectedNode.FullPath)); + if (diag.ShowDialog(this) == DialogResult.OK) + { + file.properties[i] = ("BOX", diag.Result); + if (IsSubPCKNode(treeViewMain.SelectedNode.FullPath)) + RebuildSubPCK(treeViewMain.SelectedNode); + ReloadMetaTreeView(); + saved = false; + } + return; + } + catch (Exception ex) + { + Debug.WriteLine(ex.Message); + MessageBox.Show("Failed to parse BOX value, aborting to normal functionality."); + } + break; + + default: + break; + } - return; - } - catch (Exception ex) - { - Debug.WriteLine(ex.Message); - MessageBox.Show("Failed to parse ANIM value, aborting to normal functionality. Please make sure the value only includes hexadecimal characters (0-9,A-F) and has no more than 8 characters. It can have an optional prefix of \"0x\"."); - } - } - else if (property.Item1 == "BOX" && i != -1 && file.filetype == PCKFile.FileData.FileType.SkinFile) - { - try - { - using BoxEditor diag = new BoxEditor(property.Item2, IsSubPCKNode(treeViewMain.SelectedNode.FullPath)); - if (diag.ShowDialog(this) == DialogResult.OK) + using AddMeta add = new AddMeta(property.Item1, property.Item2); + if (add.ShowDialog() == DialogResult.OK && i != -1) { - file.properties[i] = new ValueTuple("BOX", diag.Result); + file.properties[i] = new ValueTuple(add.PropertyName, add.PropertyValue); if (IsSubPCKNode(treeViewMain.SelectedNode.FullPath)) RebuildSubPCK(treeViewMain.SelectedNode); ReloadMetaTreeView(); saved = false; } - return; } - catch (Exception ex) - { - Debug.WriteLine(ex.Message); - MessageBox.Show("Failed to parse BOX value, aborting to normal functionality."); - } - } - using AddMeta add = new AddMeta(property.Item1, property.Item2); - if (add.ShowDialog() == DialogResult.OK && i != -1) - { - file.properties[i] = new ValueTuple(add.PropertyName, add.PropertyValue); - if (IsSubPCKNode(treeViewMain.SelectedNode.FullPath)) - RebuildSubPCK(treeViewMain.SelectedNode); - ReloadMetaTreeView(); - saved = false; } } @@ -997,7 +1000,8 @@ namespace PckStudio TreeNode node = treeViewMain.SelectedNode; PCKFile.FileData mfO = node.Tag as PCKFile.FileData; - PCKFile.FileData mf = new PCKFile.FileData("", mfO.filetype); // Creates new minefile template + // Creates new empty file entry + PCKFile.FileData mf = new PCKFile.FileData(string.Empty, mfO.filetype); mf.SetData(mfO.data); // adds file data to minefile string dirName = Path.GetDirectoryName(mfO.filepath).Replace("\\", "/"); @@ -1051,14 +1055,14 @@ namespace PckStudio private void ReloadMetaTreeView() { treeMeta.Nodes.Clear(); - if (treeViewMain.SelectedNode is TreeNode t && - t.Tag is PCKFile.FileData file) - file.properties.ForEach(p => + if (treeViewMain.SelectedNode is TreeNode node && + node.Tag is PCKFile.FileData file) { - TreeNode node = new TreeNode(p.Item1); - node.Tag = p; - treeMeta.Nodes.Add(node); - }); + foreach (var property in file.properties) + { + treeMeta.Nodes.Add(CreateNode(property.Item1, property)); + } + } } private void addEntryToolStripMenuItem_Click_1(object sender, EventArgs e) @@ -1224,7 +1228,7 @@ namespace PckStudio } currentPCK.Files.Add(zeroFile); currentPCK.Files.Add(loc); - if(createSkinsPCK) CreateSkinsPCKToolStripMenuItem1_Click(null, null); + if(createSkinsPCK) CreateSkinsPCKToolStripMenuItem1_Click(null, EventArgs.Empty); } private void InitializeTexturePack(int packId, int packVersion, string packName, string res, bool createSkinsPCK = false) @@ -1236,27 +1240,27 @@ namespace PckStudio PCKFile infoPCK = new PCKFile(3); - var ms = new MemoryStream(); - var ms2 = new MemoryStream(); - var ms3 = new MemoryStream(); + using (var ms = new MemoryStream()) + { + var icon = new PCKFile.FileData("icon.png", PCKFile.FileData.FileType.TextureFile); + Resources.TexturePackIcon.Save(ms, ImageFormat.Png); + icon.SetData(ms.ToArray()); + infoPCK.Files.Add(icon); + } + using (var ms = new MemoryStream()) + { var comparison = new PCKFile.FileData("comparison.png", PCKFile.FileData.FileType.TextureFile); Resources.Comparison.Save(ms, ImageFormat.Png); comparison.SetData(ms.ToArray()); - - var icon = new PCKFile.FileData("icon.png", PCKFile.FileData.FileType.TextureFile); - Resources.TexturePackIcon.Save(ms2, ImageFormat.Png); - icon.SetData(ms2.ToArray()); - - infoPCK.Files.Add(icon); infoPCK.Files.Add(comparison); + } - PCKFileWriter.Write(ms3, infoPCK, LittleEndianCheckBox.Checked); - texturepackInfo.SetData(ms3.ToArray()); - - ms.Dispose(); - ms2.Dispose(); - ms3.Dispose(); + using (var ms = new MemoryStream()) + { + PCKFileWriter.Write(ms, infoPCK, LittleEndianCheckBox.Checked); + texturepackInfo.SetData(ms.ToArray()); + } currentPCK.Files.Add(texturepackInfo); } @@ -2149,21 +2153,20 @@ namespace PckStudio private void CreateSkinsPCKToolStripMenuItem1_Click(object sender, EventArgs e) { - PCKFile.FileData NewSkinsPCKFile; - if (currentPCK.TryGetFile("Skins.pck", PCKFile.FileData.FileType.SkinDataFile, out NewSkinsPCKFile)) + if (currentPCK.TryGetFile("Skins.pck", PCKFile.FileData.FileType.SkinDataFile, out _)) { MessageBox.Show("A Skins.pck file already exists in this PCK and a new one cannot be created.", "Operation aborted"); return; } - NewSkinsPCKFile = new PCKFile.FileData("Skins.pck", PCKFile.FileData.FileType.SkinDataFile); + PCKFile.FileData newSkinsPCKFile = new PCKFile.FileData("Skins.pck", PCKFile.FileData.FileType.SkinDataFile); using (var stream = new MemoryStream()) { PCKFileWriter.Write(stream, new PCKFile(3), LittleEndianCheckBox.Checked, true); - NewSkinsPCKFile.SetData(stream.ToArray()); + newSkinsPCKFile.SetData(stream.ToArray()); } - currentPCK.Files.Add(NewSkinsPCKFile); + currentPCK.Files.Add(newSkinsPCKFile); BuildMainTreeView(); @@ -2179,8 +2182,7 @@ namespace PckStudio if (treeViewMain.SelectedNode is TreeNode t && t.Tag is PCKFile.FileData file) { - List props = new List(); - file.properties.ForEach(l => props.Add(l.property + " " + l.value)); + var props = file.properties.Select(l => l.property + " " + l.value); using (var input = new TextPrompt(props.ToArray())) { if (input.ShowDialog(this) == DialogResult.OK) diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index f9b47014..609ffe2e 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -146,29 +146,6 @@ - - UserControl - - - ColorBox.cs - - - - - Component - - - UserControl - - - TwoColorPanel.cs - - - UserControl - - - VerticalColorSlider.cs - @@ -183,6 +160,9 @@ + + Form + @@ -229,16 +209,45 @@ + + Form + + + AboutThisProgram.cs + Form ChangeLogForm.cs - + + UserControl + + + ColorBox.cs + + + + + Component + + + UserControl + + + TwoColorPanel.cs + + + UserControl + + + VerticalColorSlider.cs + + Form - + AddLanguage.cs @@ -289,29 +298,29 @@ SetBulkSpeed.cs - + Form - - CreditsEditor.cs + + creditsEditor.cs - + Form - - AddCategory.cs + + addCategory.cs - + Form - - AddMeta.cs + + addMeta.cs - + Form - - AddNewSkin.cs + + addNewSkin.cs Form @@ -331,19 +340,25 @@ GRFEditor.cs - + Form - + AddParameter.cs - + Form - - PleaseWait.cs + + pleaseWait.cs + + Form + + + Preferences.cs + Form @@ -356,11 +371,17 @@ ANIMEditor.cs - + Form - - GenerateModel.cs + + MainForm.cs + + + Form + + + generateModel.cs Form @@ -386,23 +407,23 @@ AudioEditor.cs - + Form - - InstallPS3.cs + + installPS3.cs - + Form - - InstallVita.cs + + installVita.cs - + Form - - InstallWiiU.cs + + installWiiU.cs @@ -411,23 +432,23 @@ PCK Manager.cs - + Form - - PCKCenter.cs + + pckCenter.cs - + Form - - PCKCenterBeta.cs + + PckCenterBeta.cs - + Form - - PCKCenterOpen.cs + + pckCenterOpen.cs Form @@ -435,12 +456,6 @@ LockPrompt.cs - - Form - - - Preferences.cs - Form @@ -457,32 +472,23 @@ MetaList.cs - - Form - - - MainForm.cs - - - Form - - - AboutThisProgram.cs - - - ColorBox.cs - - - VerticalColorSlider.cs + + AboutThisProgram.cs ChangeLogForm.cs - + + ColorBox.cs + + + VerticalColorSlider.cs + + AddLanguage.cs @@ -518,24 +524,24 @@ SetBulkSpeed.cs - - CreditsEditor.cs + + creditsEditor.cs Designer - - AddCategory.cs + + addCategory.cs - - AddMeta.cs + + addMeta.cs - - AddMeta.cs + + addMeta.cs - - AddNewSkin.cs + + addNewSkin.cs - - AddNewSkin.cs + + addNewSkin.cs Designer @@ -551,11 +557,17 @@ GRFEditor.cs - + AddParameter.cs - - PleaseWait.cs + + pleaseWait.cs + + + Preferences.cs + + + Preferences.cs BoxEditor.cs @@ -563,11 +575,19 @@ ANIMEditor.cs - - GenerateModel.cs + + MainForm.cs + Designer - - GenerateModel.cs + + MainForm.cs + Designer + + + generateModel.cs + + + generateModel.cs SkinPreview.cs @@ -582,17 +602,17 @@ AudioEditor.cs Designer - - InstallPS3.cs + + installPS3.cs - - InstallVita.cs + + installVita.cs - - InstallWiiU.cs + + installWiiU.cs - - InstallWiiU.cs + + installWiiU.cs MetaList.cs @@ -603,20 +623,20 @@ PCK Manager.cs - - PCKCenter.cs + + pckCenter.cs - - PCKCenter.cs + + pckCenter.cs - - PCKCenterBeta.cs + + PckCenterBeta.cs - - PCKCenterOpen.cs + + pckCenterOpen.cs - - PCKCenterOpen.cs + + pckCenterOpen.cs LockPrompt.cs @@ -624,27 +644,12 @@ LockPrompt.cs - - Preferences.cs - - - Preferences.cs - TextureConverterUtility.cs MetaList.cs - - AboutThisProgram.cs - - - MainForm.cs - - - MainForm.cs - PublicResXFileCodeGenerator Designer @@ -671,9 +676,6 @@ - - - @@ -696,6 +698,7 @@ + @@ -713,6 +716,8 @@ + + @@ -730,7 +735,6 @@ - @@ -741,9 +745,6 @@ compile; runtime; build; native; contentfiles; analyzers; buildtransitive all - - 2.0.1 - 1.0.175 @@ -768,6 +769,9 @@ 4.5.0 + + 2.0.1 + 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 1fbc60fa..a86b118e 100644 --- a/PCK_Studio.sln +++ b/PCK_Studio.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 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}" +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}") = "CrEaTiiOn-Brotherhood-Official-C-Theme", "CrEaTiiOn-Brotherhood-Official-C-Theme", "{7DB3F605-FB30-45C8-9D21-AE2FF3A0344D}" EndProject 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 @@ -17,6 +17,9 @@ Global Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 + ReleasePortable|Any CPU = ReleasePortable|Any CPU + ReleasePortable|x64 = ReleasePortable|x64 + ReleasePortable|x86 = ReleasePortable|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -31,6 +34,12 @@ Global {0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}.Release|x64.Build.0 = Release|Any CPU {0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}.Release|x86.ActiveCfg = Release|Any CPU {0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}.Release|x86.Build.0 = Release|Any CPU + {0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}.ReleasePortable|Any CPU.ActiveCfg = ReleasePortable|Any CPU + {0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}.ReleasePortable|Any CPU.Build.0 = ReleasePortable|Any CPU + {0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}.ReleasePortable|x64.ActiveCfg = ReleasePortable|Any CPU + {0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}.ReleasePortable|x64.Build.0 = ReleasePortable|Any CPU + {0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}.ReleasePortable|x86.ActiveCfg = ReleasePortable|Any CPU + {0ACAAEDE-93F5-4B5D-B8D7-A0C43359C0D6}.ReleasePortable|x86.Build.0 = ReleasePortable|Any CPU {C3D7B16C-C047-4BAA-884F-7A2308619C33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C3D7B16C-C047-4BAA-884F-7A2308619C33}.Debug|Any CPU.Build.0 = Debug|Any CPU {C3D7B16C-C047-4BAA-884F-7A2308619C33}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -43,12 +52,18 @@ Global {C3D7B16C-C047-4BAA-884F-7A2308619C33}.Release|x64.Build.0 = Release|Any CPU {C3D7B16C-C047-4BAA-884F-7A2308619C33}.Release|x86.ActiveCfg = Release|Any CPU {C3D7B16C-C047-4BAA-884F-7A2308619C33}.Release|x86.Build.0 = Release|Any CPU + {C3D7B16C-C047-4BAA-884F-7A2308619C33}.ReleasePortable|Any CPU.ActiveCfg = Release|Any CPU + {C3D7B16C-C047-4BAA-884F-7A2308619C33}.ReleasePortable|Any CPU.Build.0 = Release|Any CPU + {C3D7B16C-C047-4BAA-884F-7A2308619C33}.ReleasePortable|x64.ActiveCfg = Release|Any CPU + {C3D7B16C-C047-4BAA-884F-7A2308619C33}.ReleasePortable|x64.Build.0 = Release|Any CPU + {C3D7B16C-C047-4BAA-884F-7A2308619C33}.ReleasePortable|x86.ActiveCfg = Release|Any CPU + {C3D7B16C-C047-4BAA-884F-7A2308619C33}.ReleasePortable|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {C3D7B16C-C047-4BAA-884F-7A2308619C33} = {CA7092AE-BF12-4D57-AE25-85E7E6149BE0} + {C3D7B16C-C047-4BAA-884F-7A2308619C33} = {7DB3F605-FB30-45C8-9D21-AE2FF3A0344D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9A3BF1FB-950F-401E-9F58-EA7BBADCE6F2} diff --git a/SFGraphics b/SFGraphics deleted file mode 160000 index ec1c5f07..00000000 --- a/SFGraphics +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ec1c5f0741722cf6bea29fbe03c6f9226cc4d928