Skip to content

Commit c76ea72

Browse files
committed
ModApi.InterimSetup: use UI files from ModAPI.Common
1 parent f57c2f1 commit c76ea72

File tree

8 files changed

+13
-2338
lines changed

8 files changed

+13
-2338
lines changed

ModApi.InterimSetup/ModApi.InterimSetup/App.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
<Application.Resources>
77
<ResourceDictionary>
88
<ResourceDictionary.MergedDictionaries>
9-
<ResourceDictionary Source="pack://application:,,,/ModApi.InterimSetup;component/Themes/Modena.xaml"/>
9+
<ResourceDictionary Source="pack://application:,,,/AlterMod.xaml"/>
10+
<ResourceDictionary Source="pack://application:,,,/AlterModBaseLight.xaml"/>
11+
<ResourceDictionary Source="pack://application:,,,/AlterModBlue.xaml"/>
1012
</ResourceDictionary.MergedDictionaries>
1113
</ResourceDictionary>
1214
</Application.Resources>

ModApi.InterimSetup/ModApi.InterimSetup/Converters.cs

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

ModApi.InterimSetup/ModApi.InterimSetup/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:ModApi.InterimSetup"
7-
xmlns:ui="clr-namespace:ModApi.UI"
7+
xmlns:ui="clr-namespace:ModAPI.Common.UI"
88
mc:Ignorable="d"
99
WindowStartupLocation="CenterScreen"
1010
Title="ModAPI Launcher Kit Setup" Height="450" Width="800" ResizeMode="NoResize" Background="{DynamicResource WindowBackgroundBrush}" Closing="Window_Closing">

ModApi.InterimSetup/ModApi.InterimSetup/ModApi.InterimSetup.csproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,12 @@
8383
<SubType>Designer</SubType>
8484
</ApplicationDefinition>
8585
<Compile Include="..\..\VersionInfo\AssemblyVersionInfo.cs" />
86-
<Compile Include="Converters.cs" />
87-
<Compile Include="SystemScaling.cs" />
86+
<Compile Include="..\..\ModAPI.Common\UI\Converters.cs" />
87+
<Compile Include="..\..\ModAPI.Common\UI\SystemScaling.cs" />
88+
<Compile Include="..\..\ModAPI.Common\UI\Windows\CompositingWindow.cs" />
89+
<Compile Include="..\..\ModAPI.Common\UI\Windows\DecoratableWindow.cs" />
90+
<Compile Include="..\..\ModAPI.Common\UI\ToggleSwitch.cs" />
91+
<Compile Include="..\..\ModAPI.Common\NativeMethods.cs" />
8892
<Page Include="MainWindow.xaml">
8993
<Generator>MSBuild:Compile</Generator>
9094
<SubType>Designer</SubType>
@@ -97,15 +101,15 @@
97101
<DependentUpon>MainWindow.xaml</DependentUpon>
98102
<SubType>Code</SubType>
99103
</Compile>
100-
<Page Include="Themes\Colors\ModenaBaseLight.xaml">
104+
<Page Include="..\..\ModAPI.Common\UI\Themes\Colors\AlterModBaseLight.xaml">
101105
<SubType>Designer</SubType>
102106
<Generator>MSBuild:Compile</Generator>
103107
</Page>
104-
<Page Include="Themes\Colors\ModenaBlue.xaml">
108+
<Page Include="..\..\ModAPI.Common\UI\Themes\Colors\AlterModBlue.xaml">
105109
<SubType>Designer</SubType>
106110
<Generator>MSBuild:Compile</Generator>
107111
</Page>
108-
<Page Include="Themes\Modena.xaml">
112+
<Page Include="..\..\ModAPI.Common\UI\Themes\AlterMod.xaml">
109113
<SubType>Designer</SubType>
110114
<Generator>MSBuild:Compile</Generator>
111115
</Page>

ModApi.InterimSetup/ModApi.InterimSetup/SystemScaling.cs

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

ModApi.InterimSetup/ModApi.InterimSetup/Themes/Colors/ModenaBaseLight.xaml

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

ModApi.InterimSetup/ModApi.InterimSetup/Themes/Colors/ModenaBlue.xaml

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

0 commit comments

Comments
 (0)