From b1dad261d1ca890dde4c0922f5863c15a3a27c2a Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Sun, 29 Oct 2023 12:00:32 +0100
Subject: [PATCH] Add Resources/ directory

---
 Elwig/Elwig.csproj                             |  17 +++++++----------
 .../{elwig.ico => Resources/Images/Elwig.ico}  | Bin
 .../{elwig.png => Resources/Images/Elwig.png}  | Bin
 Elwig/Windows/MainWindow.xaml                  |   2 +-
 Installer/Package.wxs                          |   2 +-
 Setup/Bundle.wxs                               |   2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)
 rename Elwig/{elwig.ico => Resources/Images/Elwig.ico} (100%)
 rename Elwig/{elwig.png => Resources/Images/Elwig.png} (100%)

diff --git a/Elwig/Elwig.csproj b/Elwig/Elwig.csproj
index 3237846..1115ad8 100644
--- a/Elwig/Elwig.csproj
+++ b/Elwig/Elwig.csproj
@@ -6,15 +6,20 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
-    <ApplicationIcon>elwig.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
     <Version>0.4.3</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="elwig.ico" />
+    <Resource Include="Resources\Images\Elwig.png" />
+    <Content Include="Resources\Images\Elwig.ico" />
   </ItemGroup>
 
+  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+    <Exec Command="call fetch-resources.bat" />
+  </Target>
+
   <ItemGroup>
     <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
     <PackageReference Include="ini-parser" Version="2.5.2" />
@@ -29,12 +34,4 @@
     <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Resource Include="elwig.png" />
-  </ItemGroup>
-
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="call fetch-resources.bat" />
-  </Target>
-
 </Project>
diff --git a/Elwig/elwig.ico b/Elwig/Resources/Images/Elwig.ico
similarity index 100%
rename from Elwig/elwig.ico
rename to Elwig/Resources/Images/Elwig.ico
diff --git a/Elwig/elwig.png b/Elwig/Resources/Images/Elwig.png
similarity index 100%
rename from Elwig/elwig.png
rename to Elwig/Resources/Images/Elwig.png
diff --git a/Elwig/Windows/MainWindow.xaml b/Elwig/Windows/MainWindow.xaml
index fb03e2d..002ec6a 100644
--- a/Elwig/Windows/MainWindow.xaml
+++ b/Elwig/Windows/MainWindow.xaml
@@ -30,7 +30,7 @@
                 <ColumnDefinition Width="100"/>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
-            <Image Source="/elwig.png" RenderOptions.BitmapScalingMode="HighQuality" Grid.Column="0"
+            <Image Source="\Resources\Images\Elwig.png" RenderOptions.BitmapScalingMode="HighQuality" Grid.Column="0"
                    HorizontalAlignment="Left" Margin="5,5,5,5" VerticalAlignment="Top"/>
             <TextBlock Grid.Column="1" FontSize="32" HorizontalAlignment="Left" Margin="0,5,0,0" VerticalAlignment="Top">
                 Elwig
diff --git a/Installer/Package.wxs b/Installer/Package.wxs
index 230bf38..4305f0b 100644
--- a/Installer/Package.wxs
+++ b/Installer/Package.wxs
@@ -3,7 +3,7 @@
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" AllowSameVersionUpgrades="no" />
 	<MediaTemplate EmbedCab="true" MaximumUncompressedMediaSize="10"/>
 
-	<Icon Id="icon.ico" SourceFile="$(var.ElwigProjectDir)\elwig.ico"/>
+	<Icon Id="icon.ico" SourceFile="$(var.ElwigProjectDir)\Resourcs\Images\Elwig.ico"/>
 	<Property Id="ARPPRODUCTICON" Value="icon.ico"/>
 
 	<Feature Id="Main">
diff --git a/Setup/Bundle.wxs b/Setup/Bundle.wxs
index ed298fb..46d776d 100644
--- a/Setup/Bundle.wxs
+++ b/Setup/Bundle.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-  <Bundle Name="Elwig" Manufacturer="Elwig" Version="!(bind.packageVersion.ElwigMsi)" UpgradeCode="f3c8fcab-c37c-43aa-9ab8-e42f4bb518b7" IconSourceFile="$(var.ElwigProjectDir)\elwig.ico" >
+  <Bundle Name="Elwig" Manufacturer="Elwig" Version="!(bind.packageVersion.ElwigMsi)" UpgradeCode="f3c8fcab-c37c-43aa-9ab8-e42f4bb518b7" IconSourceFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.ico" >
 	<BootstrapperApplication>
       <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" LogoFile="$(var.ElwigProjectDir)\elwig.png" SuppressOptionsUI="yes" ShowVersion="yes" />   
 	</BootstrapperApplication>