Skip to content

Commit bbb4cbf

Browse files
Move model parts of MVC to the separate project
1 parent 580d424 commit bbb4cbf

7 files changed

Lines changed: 29 additions & 8 deletions

File tree

‎Source/Avalonia/Views/MainWindow.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
77
x:Class="WWSTE.Avalonia.Views.MainWindow"
88
x:DataType="vm:MainViewModel"
9-
Icon="/Assets/app.ico"
9+
Icon="avares://WWSTE.Core/Assets/app.ico"
1010
Title="Westwood String Table Editor">
1111
<Grid
1212
RowDefinitions="Auto,*"

‎Source/Avalonia/WWSTE.Avalonia.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="../../Libs/mah_boi.Tools/Source/Tools/mah_boi.Tools.csproj"></ProjectReference>
12-
</ItemGroup>
13-
14-
<ItemGroup>
15-
<AvaloniaResource Include="Assets\**" />
11+
<ProjectReference Include="../Core/WWSTE.Core.csproj" />
1612
</ItemGroup>
1713

1814
<ItemGroup>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using System.Text;
44

5-
namespace WWSTE.Avalonia.Models;
5+
namespace WWSTE.Core.Models;
66

77
public struct Settings
88
{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Rampastring.Tools;
55
using Rampastring.Tools.Ini;
66

7-
namespace WWSTE.Avalonia.Models;
7+
namespace WWSTE.Core.Models;
88

99
public class UserSettings
1010
{

‎Source/Core/WWSTE.Core.csproj‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<RootNamespace>WWSTE.Core</RootNamespace>
4+
<TargetFramework>net10.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<ProjectReference Include="../../Libs/mah_boi.Tools/Source/Tools/mah_boi.Tools.csproj" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
13+
<AvaloniaResource Include="Assets\**" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="Avalonia" Version="12.1.0" PrivateAssets="all" />
18+
</ItemGroup>
19+
</Project>

‎WestwoodStringTableEditor.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rampastring.Tools", "Libs\m
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WWSTE.Avalonia", "Source\Avalonia\WWSTE.Avalonia.csproj", "{CB4DFC49-0B38-6165-C0EC-6BE70E8E8A3D}"
1111
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WWSTE.Core", "Source\Core\WWSTE.Core.csproj", "{00267656-ECBC-4F48-9E6B-CA9B418068F8}"
13+
EndProject
1214
Global
1315
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1416
Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,10 @@ Global
2729
{CB4DFC49-0B38-6165-C0EC-6BE70E8E8A3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
2830
{CB4DFC49-0B38-6165-C0EC-6BE70E8E8A3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
2931
{CB4DFC49-0B38-6165-C0EC-6BE70E8E8A3D}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{00267656-ECBC-4F48-9E6B-CA9B418068F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{00267656-ECBC-4F48-9E6B-CA9B418068F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{00267656-ECBC-4F48-9E6B-CA9B418068F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{00267656-ECBC-4F48-9E6B-CA9B418068F8}.Release|Any CPU.Build.0 = Release|Any CPU
3036
EndGlobalSection
3137
GlobalSection(SolutionProperties) = preSolution
3238
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)