Skip to content

Commit 990e865

Browse files
Refactor program to use only 1 form
Refactored the UX and GUI in how you no longer need to click on a list to then edit it's tedious value, you can now just edit it in the form. Also formatted and cleaned up the code and updated it for .NET 10 and got it optimized and shortened and simplified the code to prepare for the Avalonia UI port Update based on this new commit.
1 parent a97f8b2 commit 990e865

31 files changed

Lines changed: 742 additions & 3185 deletions

src/ARM9Editor.csproj

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0-windows</TargetFramework>
3+
<TargetFramework>net10.0-windows</TargetFramework>
44
<OutputType>WinExe</OutputType>
55
<RootNamespace>ARM9Editor</RootNamespace>
66
<AssemblyName>ARM9Editor</AssemblyName>
@@ -15,7 +15,7 @@
1515
<SelfContained>false</SelfContained>
1616
<PublishSingleFile>true</PublishSingleFile>
1717
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
18-
<StartupObject></StartupObject>
18+
<StartupObject>ARM9Editor.Program</StartupObject>
1919
<ApplicationIcon>Icon.ico</ApplicationIcon>
2020
<PlatformTarget>AnyCPU</PlatformTarget>
2121
<GenerateDocumentationFile>False</GenerateDocumentationFile>
@@ -40,9 +40,7 @@
4040
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
4141
</PropertyGroup>
4242
<ItemGroup>
43-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
44-
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
45-
<PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
43+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
4644
</ItemGroup>
4745
<ItemGroup>
4846
<None Remove="assets\json\character_offsets.json" />
@@ -57,7 +55,9 @@
5755
<None Remove="slot_offsets.json" />
5856
</ItemGroup>
5957
<ItemGroup>
60-
<Content Include="Icon.ico" />
58+
<EmbeddedResource Include="Icon.ico">
59+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
60+
</EmbeddedResource>
6161
</ItemGroup>
6262
<ItemGroup>
6363
<EmbeddedResource Include="assets\json\character_offsets.json" />
@@ -68,15 +68,6 @@
6868
<EmbeddedResource Include="assets\json\slot_offsets.json" />
6969
</ItemGroup>
7070
<ItemGroup>
71-
<Compile Update="forms\ChangeCharacterFileNameForm.cs">
72-
<SubType>Form</SubType>
73-
</Compile>
74-
<Compile Update="forms\ChangeKartPrefixForm.cs">
75-
<SubType>Form</SubType>
76-
</Compile>
77-
<Compile Update="forms\ChangeOnlineCourseIdForm.cs">
78-
<SubType>Form</SubType>
79-
</Compile>
8071
<Compile Update="Properties\Settings.Designer.cs">
8172
<DesignTimeSharedInput>True</DesignTimeSharedInput>
8273
<AutoGen>True</AutoGen>

src/ARM9Editor.sln

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/ARM9Editor.slnx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Solution>
2+
<Project Path="ARM9Editor.csproj" />
3+
</Solution>

0 commit comments

Comments
 (0)