From 129a0ad283cf14a2bbc9583828011ba6e8dacc9e Mon Sep 17 00:00:00 2001
From: Yoshi Askharoun <jjask7@gmail.com>
Date: Fri, 31 Dec 2021 23:19:31 -0600
Subject: [PATCH] Added custom icons + more links on About page

---
 ZuneModdingHelper/App.xaml                  |   2 +
 ZuneModdingHelper/{ => Assets}/ZMH_Icon.ico | Bin
 ZuneModdingHelper/Assets/ZMH_Icons.ttf      | Bin 0 -> 3700 bytes
 ZuneModdingHelper/MainWindow.xaml           |  74 +++++++++++++-------
 ZuneModdingHelper/ZuneModdingHelper.csproj  |  56 ++++++++-------
 5 files changed, 83 insertions(+), 49 deletions(-)
 rename ZuneModdingHelper/{ => Assets}/ZMH_Icon.ico (100%)
 create mode 100644 ZuneModdingHelper/Assets/ZMH_Icons.ttf

diff --git a/ZuneModdingHelper/App.xaml b/ZuneModdingHelper/App.xaml
index 2abe484..9fb4a2b 100644
--- a/ZuneModdingHelper/App.xaml
+++ b/ZuneModdingHelper/App.xaml
@@ -12,6 +12,8 @@
                 <!-- Theme setting -->
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Magenta.xaml" />
             </ResourceDictionary.MergedDictionaries>
+
+            <FontFamily x:Key="ZMHIcons">Assets/ZMH_Icons.ttf#ZMHIcons</FontFamily>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/ZuneModdingHelper/ZMH_Icon.ico b/ZuneModdingHelper/Assets/ZMH_Icon.ico
similarity index 100%
rename from ZuneModdingHelper/ZMH_Icon.ico
rename to ZuneModdingHelper/Assets/ZMH_Icon.ico
diff --git a/ZuneModdingHelper/Assets/ZMH_Icons.ttf b/ZuneModdingHelper/Assets/ZMH_Icons.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..de28985a6c8063df9625e144e75fc52b6a845382
GIT binary patch
literal 3700
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

literal 0
HcmV?d00001

diff --git a/ZuneModdingHelper/MainWindow.xaml b/ZuneModdingHelper/MainWindow.xaml
index 32c1780..7b08b9b 100644
--- a/ZuneModdingHelper/MainWindow.xaml
+++ b/ZuneModdingHelper/MainWindow.xaml
@@ -9,14 +9,21 @@
                  mc:Ignorable="d"
                  Title="{x:Static local:App.Title}" Height="450" Width="800" WindowStartupLocation="CenterScreen"
                  Loaded="Window_Loaded">
-    
+
+    <mah:MetroWindow.IconTemplate>
+        <DataTemplate>
+            <mah:FontIcon Glyph="&#xE000;" FontFamily="{StaticResource ZMHIcons}"
+                          Margin="0,0,-6,0"/>
+        </DataTemplate>
+    </mah:MetroWindow.IconTemplate>
+
     <mah:MetroWindow.RightWindowCommands>
         <mah:WindowCommands>
             <Button Style="{StaticResource MahApps.Styles.Button.WindowCommands}" ToolTip="Check for updates" Click="UpdatesButton_Click">
-                <mah:FontIcon Glyph="&#xE895;" FontFamily="Segoe MDL2 Assets" FontSize="18"/>
+                <mah:FontIcon Glyph="&#xE003;" FontFamily="{StaticResource ZMHIcons}"/>
             </Button>
             <Button Style="{StaticResource MahApps.Styles.Button.WindowCommands}" ToolTip="About" Click="AboutButton_Click">
-                <mah:FontIcon Glyph="&#xE946;" FontFamily="Segoe MDL2 Assets"/>
+                <mah:FontIcon Glyph="&#xE004;" FontFamily="{StaticResource ZMHIcons}"/>
             </Button>
         </mah:WindowCommands>
     </mah:MetroWindow.RightWindowCommands>
@@ -27,24 +34,43 @@
                 <mah:Flyout.Header>
                     <Grid>
                         <TextBlock Text="About" FontSize="26" FontWeight="Bold"/>
-                        <Button Content="Donate" Click="DonateButton_Click" ToolTip="Support development of this and other projects"
-                                Grid.Row="1" Grid.Column="1" VerticalAlignment="Stretch" HorizontalAlignment="Right" Margin="4"
-                                Style="{StaticResource MahApps.Styles.Button.MetroSquare.Accent}"/>
+                        <Button Click="DonateButton_Click" ToolTip="Support development of this and other projects"
+                                HorizontalAlignment="Right" Margin="4"
+                                Style="{StaticResource MahApps.Styles.Button.MetroSquare.Accent}">
+                            <mah:FontIcon Glyph="&#xE006;" FontFamily="{StaticResource ZMHIcons}"/>
+                        </Button>
                     </Grid>
                 </mah:Flyout.Header>
-                <TextBlock FontSize="14" Padding="16" TextWrapping="Wrap">
-                    <Run Text="{x:Static local:App.Title}" FontWeight="Bold" FontSize="16"/><LineBreak/>
-                    <Run Text="{x:Static local:App.VersionStr}"/><LineBreak/>
-                    <Hyperlink NavigateUri="https://github.com/ZuneDev/ZuneModdingHelper" RequestNavigate="Link_RequestNavigate">
-                        <Run Text="View source"/>
-                    </Hyperlink><LineBreak/>
-                    <Hyperlink NavigateUri="https://github.com/ZuneDev/ZuneModdingHelper/releases" RequestNavigate="Link_RequestNavigate">
-                        <Run Text="View releases"/>
-                    </Hyperlink><LineBreak/><LineBreak/>
-                    <Run Text="Developed by Joshua &quot;Yoshi&quot; Askharoun." FontWeight="SemiBold"/>
-                    <Run Text="Mods included with authors' permission."/><LineBreak/><LineBreak/>
-                    <Run Text="I am not liable for any damages caused directly or indirectly by this tool or any of the mods it contains."/>
-                </TextBlock>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+
+                    <TextBlock FontSize="14" Padding="16" TextWrapping="Wrap">
+                        <Run Text="{x:Static local:App.Title}" FontWeight="Bold" FontSize="16"/><LineBreak/>
+                        <Run Text="{x:Static local:App.VersionStr}"/><LineBreak/>
+                        <Hyperlink NavigateUri="https://github.com/ZuneDev/ZuneModdingHelper" RequestNavigate="Link_RequestNavigate">
+                            <Run Text="&#xE005;" FontFamily="{StaticResource ZMHIcons}"/>
+                            <Run Text="View source"/>
+                        </Hyperlink><LineBreak/>
+                        <Hyperlink NavigateUri="https://github.com/ZuneDev/ZuneModdingHelper/releases" RequestNavigate="Link_RequestNavigate">
+                            <Run Text="&#xE003;" FontFamily="{StaticResource ZMHIcons}"/>
+                            <Run Text="View releases"/>
+                        </Hyperlink><LineBreak/>
+                        <Hyperlink NavigateUri="https://reddit.com/r/Zune" RequestNavigate="Link_RequestNavigate">
+                            <Run Text="&#xE001;" FontFamily="{StaticResource ZMHIcons}"/>
+                            <Run Text="Join r/Zune subreddit"/>
+                        </Hyperlink><LineBreak/>
+                        <Hyperlink NavigateUri="https://discord.zunes.me/" RequestNavigate="Link_RequestNavigate">
+                            <Run Text="&#xE002;" FontFamily="{StaticResource ZMHIcons}"/>
+                            <Run Text="Join r/Zune Discord server"/>
+                        </Hyperlink><LineBreak/><LineBreak/>
+                        <Run Text="Developed by Joshua &quot;Yoshi&quot; Askharoun." FontWeight="SemiBold"/>
+                        <Run Text="Mods included with authors' permission."/><LineBreak/><LineBreak/>
+                        <Run Text="I am not liable for any damages caused directly or indirectly by this tool or any of the mods it contains."/>
+                    </TextBlock>
+                </Grid>
             </mah:Flyout>
         </mah:FlyoutsControl>
     </mah:MetroWindow.Flyouts>
@@ -54,7 +80,7 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        
+
         <ListView x:Name="ModList" HorizontalContentAlignment="Stretch"
                   ScrollViewer.HorizontalScrollBarVisibility="Disabled">
             <ListView.Resources>
@@ -69,12 +95,12 @@
                     <Setter Property="Grid.RowSpan" Value="3"/>
                 </Style>
             </ListView.Resources>
-            
+
             <ListView.ItemTemplate>
                 <DataTemplate DataType="{x:Type core:Mod}">
-                    <Border BorderThickness="0,0,0,0" BorderBrush="{StaticResource MahApps.Brushes.Separator}">
-                        <Grid Margin="8">
-
+                    <Border BorderThickness="0,0,0,0" BorderBrush="{StaticResource MahApps.Brushes.Separator}"
+                            Padding="8">
+                        <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto"/>
                                 <RowDefinition Height="*"/>
diff --git a/ZuneModdingHelper/ZuneModdingHelper.csproj b/ZuneModdingHelper/ZuneModdingHelper.csproj
index cdeebeb..be5627b 100644
--- a/ZuneModdingHelper/ZuneModdingHelper.csproj
+++ b/ZuneModdingHelper/ZuneModdingHelper.csproj
@@ -1,33 +1,39 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <OutputType>WinExe</OutputType>
-        <TargetFramework>net5.0-windows</TargetFramework>
-        <UseWPF>true</UseWPF>
-        <ApplicationManifest>app.manifest</ApplicationManifest>
-        <Version>2021.12.30.0</Version>
-        <Authors>Joshua "Yoshi" Askharoun</Authors>
-        <RepositoryUrl>https://github.com/ZuneDev/ZuneModdingHelper</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <Platforms>x64;x86</Platforms>
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net5.0-windows</TargetFramework>
+		<UseWPF>true</UseWPF>
+		<ApplicationManifest>app.manifest</ApplicationManifest>
+		<Version>2021.12.30.0</Version>
+		<Authors>Joshua "Yoshi" Askharoun</Authors>
+		<RepositoryUrl>https://github.com/ZuneDev/ZuneModdingHelper</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
+		<Platforms>x64;x86</Platforms>
 		<LangVersion>latest</LangVersion>
-        <ApplicationIcon>ZMH_Icon.ico</ApplicationIcon>
-    </PropertyGroup>
+		<ApplicationIcon>Assets\ZMH_Icon.ico</ApplicationIcon>
+	</PropertyGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\OwlCore.Wpf\OwlCore.Wpf.csproj" />
-        <ProjectReference Include="..\ZuneModCore\ZuneModCore.csproj" />
-    </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\OwlCore.Wpf\OwlCore.Wpf.csproj" />
+		<ProjectReference Include="..\ZuneModCore\ZuneModCore.csproj" />
+	</ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Flurl.Http" Version="3.2.0" />
-        <PackageReference Include="MahApps.Metro" Version="2.4.9" />
-        <PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.4.0" />
-        <PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.4.0" />
-        <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-        <PackageReference Include="OwlCore" Version="0.0.43" />
-        <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
+	<ItemGroup>
+		<PackageReference Include="Flurl.Http" Version="3.2.0" />
+		<PackageReference Include="MahApps.Metro" Version="2.4.9" />
+		<PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.4.0" />
+		<PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.4.0" />
+		<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+		<PackageReference Include="OwlCore" Version="0.0.43" />
+		<PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
 		<PackageReference Include="Syroot.Windows.IO.KnownFolders" Version="1.2.3" />
-    </ItemGroup>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Resource Include="Assets\ZMH_Icons.ttf">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </Resource>
+	</ItemGroup>
 
 </Project>