From a01f951d070039849034f4ceaac3b73ee98f9348 Mon Sep 17 00:00:00 2001
From: erri120 <erri120@protonmail.com>
Date: Wed, 9 Oct 2019 11:37:23 +0200
Subject: [PATCH] Moved WPFs to UI folder

---
 Wabbajack/App.xaml                            |   2 +-
 .../Icons}/square_transparent_icon.ico        | Bin
 Wabbajack/{ => UI}/MainWindow.xaml            |   2 +-
 Wabbajack/{ => UI}/MainWindow.xaml.cs         |   0
 Wabbajack/{ => UI}/ModeSelectionWindow.xaml   |   2 +-
 .../{ => UI}/ModeSelectionWindow.xaml.cs      |   0
 .../{ => UI}/ModlistPropertiesWindow.xaml     |   2 +-
 .../{ => UI}/ModlistPropertiesWindow.xaml.cs  |   0
 Wabbajack/{ => UI}/UIUtils.cs                 |   0
 Wabbajack/Wabbajack.csproj                    |  18 +++++++++---------
 10 files changed, 13 insertions(+), 13 deletions(-)
 rename Wabbajack/{ => UI/Icons}/square_transparent_icon.ico (100%)
 rename Wabbajack/{ => UI}/MainWindow.xaml (98%)
 rename Wabbajack/{ => UI}/MainWindow.xaml.cs (100%)
 rename Wabbajack/{ => UI}/ModeSelectionWindow.xaml (94%)
 rename Wabbajack/{ => UI}/ModeSelectionWindow.xaml.cs (100%)
 rename Wabbajack/{ => UI}/ModlistPropertiesWindow.xaml (96%)
 rename Wabbajack/{ => UI}/ModlistPropertiesWindow.xaml.cs (100%)
 rename Wabbajack/{ => UI}/UIUtils.cs (100%)

diff --git a/Wabbajack/App.xaml b/Wabbajack/App.xaml
index 245efda8..18bed80d 100644
--- a/Wabbajack/App.xaml
+++ b/Wabbajack/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Wabbajack"
-             StartupUri="ModeSelectionWindow.xaml"
+             StartupUri="UI\ModeSelectionWindow.xaml"
              ShutdownMode="OnExplicitShutdown">
     <Application.Resources>
         <ResourceDictionary>
diff --git a/Wabbajack/square_transparent_icon.ico b/Wabbajack/UI/Icons/square_transparent_icon.ico
similarity index 100%
rename from Wabbajack/square_transparent_icon.ico
rename to Wabbajack/UI/Icons/square_transparent_icon.ico
diff --git a/Wabbajack/MainWindow.xaml b/Wabbajack/UI/MainWindow.xaml
similarity index 98%
rename from Wabbajack/MainWindow.xaml
rename to Wabbajack/UI/MainWindow.xaml
index a2af9f8d..952e81ff 100644
--- a/Wabbajack/MainWindow.xaml
+++ b/Wabbajack/UI/MainWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:Wabbajack"
         mc:Ignorable="d"
         Title="Wabbajack" Height="960" Width="1448"
-        Style="{StaticResource {x:Type Window}}" Icon="square_transparent_icon.ico" WindowStyle="ToolWindow"
+        Style="{StaticResource {x:Type Window}}" Icon="Icons/square_transparent_icon.ico" WindowStyle="ToolWindow"
         ResizeMode="NoResize"
         Closing="Window_Closing">
     <Grid Margin="16">
diff --git a/Wabbajack/MainWindow.xaml.cs b/Wabbajack/UI/MainWindow.xaml.cs
similarity index 100%
rename from Wabbajack/MainWindow.xaml.cs
rename to Wabbajack/UI/MainWindow.xaml.cs
diff --git a/Wabbajack/ModeSelectionWindow.xaml b/Wabbajack/UI/ModeSelectionWindow.xaml
similarity index 94%
rename from Wabbajack/ModeSelectionWindow.xaml
rename to Wabbajack/UI/ModeSelectionWindow.xaml
index 70eb1ab9..fd92b45e 100644
--- a/Wabbajack/ModeSelectionWindow.xaml
+++ b/Wabbajack/UI/ModeSelectionWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        Style="{StaticResource {x:Type Window}}" Icon="square_transparent_icon.ico" WindowStyle="ToolWindow"
+        Style="{StaticResource {x:Type Window}}" Icon="Icons/square_transparent_icon.ico" WindowStyle="ToolWindow"
         xmlns:local="clr-namespace:Wabbajack"
         mc:Ignorable="d"
         Title="Wabbajack" Height="500" Width="800" ResizeMode="NoResize"
diff --git a/Wabbajack/ModeSelectionWindow.xaml.cs b/Wabbajack/UI/ModeSelectionWindow.xaml.cs
similarity index 100%
rename from Wabbajack/ModeSelectionWindow.xaml.cs
rename to Wabbajack/UI/ModeSelectionWindow.xaml.cs
diff --git a/Wabbajack/ModlistPropertiesWindow.xaml b/Wabbajack/UI/ModlistPropertiesWindow.xaml
similarity index 96%
rename from Wabbajack/ModlistPropertiesWindow.xaml
rename to Wabbajack/UI/ModlistPropertiesWindow.xaml
index fb50c91e..ca664669 100644
--- a/Wabbajack/ModlistPropertiesWindow.xaml
+++ b/Wabbajack/UI/ModlistPropertiesWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:Wabbajack"
         mc:Ignorable="d"
         Title="Wabbajack (Modlist Properties)" Height="600" Width="900"
-        Style="{StaticResource {x:Type Window}}" Icon="square_transparent_icon.ico" WindowStyle="ToolWindow"
+        Style="{StaticResource {x:Type Window}}" Icon="Icons/square_transparent_icon.ico" WindowStyle="ToolWindow"
         ResizeMode="NoResize"
         Closing="Window_Closing">
     <Grid Margin="8">
diff --git a/Wabbajack/ModlistPropertiesWindow.xaml.cs b/Wabbajack/UI/ModlistPropertiesWindow.xaml.cs
similarity index 100%
rename from Wabbajack/ModlistPropertiesWindow.xaml.cs
rename to Wabbajack/UI/ModlistPropertiesWindow.xaml.cs
diff --git a/Wabbajack/UIUtils.cs b/Wabbajack/UI/UIUtils.cs
similarity index 100%
rename from Wabbajack/UIUtils.cs
rename to Wabbajack/UI/UIUtils.cs
diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj
index 55144643..50fd40dc 100644
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@@ -54,7 +54,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>square_transparent_icon.ico</ApplicationIcon>
+    <ApplicationIcon>UI\Icons\square_transparent_icon.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28no commandargs%29|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -186,24 +186,24 @@
     </ApplicationDefinition>
     <Compile Include="Data.cs" />
     <Compile Include="LambdaCommand.cs" />
-    <Compile Include="ModlistPropertiesWindow.xaml.cs">
+    <Compile Include="UI\ModlistPropertiesWindow.xaml.cs">
       <DependentUpon>ModlistPropertiesWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="NexusApi\Dtos.cs" />
     <Compile Include="NexusApi\NexusApiUtils.cs" />
-    <Compile Include="ModeSelectionWindow.xaml.cs">
+    <Compile Include="UI\ModeSelectionWindow.xaml.cs">
       <DependentUpon>ModeSelectionWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="ReportBuilder.cs" />
     <Compile Include="Themes\LeftMarginMultiplierConverter.cs" />
     <Compile Include="Themes\TreeViewItemExtensions.cs" />
-    <Compile Include="UIUtils.cs" />
+    <Compile Include="UI\UIUtils.cs" />
     <Compile Include="Updater\CheckForUpdates.cs" />
     <Compile Include="Validation\DTOs.cs" />
     <Compile Include="Validation\ValidateModlist.cs" />
     <Compile Include="ViewModel.cs" />
     <Compile Include="zEditIntegration.cs" />
-    <Page Include="MainWindow.xaml">
+    <Page Include="UI\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -215,15 +215,15 @@
     <Compile Include="AutoScrollBehavior.cs" />
     <Compile Include="Compiler.cs" />
     <Compile Include="Installer.cs" />
-    <Compile Include="MainWindow.xaml.cs">
+    <Compile Include="UI\MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="ModeSelectionWindow.xaml">
+    <Page Include="UI\ModeSelectionWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ModlistPropertiesWindow.xaml">
+    <Page Include="UI\ModlistPropertiesWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -287,7 +287,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="square_transparent_icon.ico" />
+    <Resource Include="UI\Icons\square_transparent_icon.ico" />
   </ItemGroup>
   <ItemGroup>
     <None Include="css.css" />