From 8985e9d1417d3f91645ba621c6c47769ba77be97 Mon Sep 17 00:00:00 2001
From: Yoshi Askharoun <jjask7@gmail.com>
Date: Wed, 4 Aug 2021 20:03:35 -0500
Subject: [PATCH] Moved install button next to reset button

---
 ZuneModCore/Mods/VideoSyncMod.cs           |  2 +-
 ZuneModdingHelper.sln                      | 16 ++---
 ZuneModdingHelper/App.xaml.cs              |  8 +--
 ZuneModdingHelper/MainWindow.xaml          | 70 +++++++++++++---------
 ZuneModdingHelper/MainWindow.xaml.cs       |  7 ++-
 ZuneModdingHelper/ZuneModdingHelper.csproj |  6 +-
 ZuneModdingHelper/app.manifest             |  2 +-
 7 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/ZuneModCore/Mods/VideoSyncMod.cs b/ZuneModCore/Mods/VideoSyncMod.cs
index 473c1ac..a2c7c3c 100644
--- a/ZuneModCore/Mods/VideoSyncMod.cs
+++ b/ZuneModCore/Mods/VideoSyncMod.cs
@@ -30,7 +30,7 @@ namespace ZuneModCore.Mods
         {
             // Make a backup of the original file
             FileVersionInfo wmvDllVersionInfo = FileVersionInfo.GetVersionInfo(WMVCORE_PATH);
-            if (Version.Parse(wmvDllVersionInfo.ProductVersion!) <= new Version(12, 0, 10586, 0))
+            if (Version.Parse(wmvDllVersionInfo.ProductVersion!) != new Version(12, 0, 10586, 0))
                 File.Copy(WMVCORE_PATH, Path.Combine(StorageDirectory, "WMVCORE.original.dll"), true);
 
             // Get the working WMVCORE.dll
diff --git a/ZuneModdingHelper.sln b/ZuneModdingHelper.sln
index 1f7b0c3..4abc2b0 100644
--- a/ZuneModdingHelper.sln
+++ b/ZuneModdingHelper.sln
@@ -17,26 +17,26 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A4AE840D-BC01-4E60-B106-289218D9479F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4AE840D-BC01-4E60-B106-289218D9479F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4AE840D-BC01-4E60-B106-289218D9479F}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{A4AE840D-BC01-4E60-B106-289218D9479F}.Debug|Any CPU.Build.0 = Debug|x86
 		{A4AE840D-BC01-4E60-B106-289218D9479F}.Debug|x64.ActiveCfg = Debug|x64
 		{A4AE840D-BC01-4E60-B106-289218D9479F}.Debug|x64.Build.0 = Debug|x64
 		{A4AE840D-BC01-4E60-B106-289218D9479F}.Debug|x86.ActiveCfg = Debug|x86
 		{A4AE840D-BC01-4E60-B106-289218D9479F}.Debug|x86.Build.0 = Debug|x86
-		{A4AE840D-BC01-4E60-B106-289218D9479F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4AE840D-BC01-4E60-B106-289218D9479F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4AE840D-BC01-4E60-B106-289218D9479F}.Release|Any CPU.ActiveCfg = Release|x86
+		{A4AE840D-BC01-4E60-B106-289218D9479F}.Release|Any CPU.Build.0 = Release|x86
 		{A4AE840D-BC01-4E60-B106-289218D9479F}.Release|x64.ActiveCfg = Release|x64
 		{A4AE840D-BC01-4E60-B106-289218D9479F}.Release|x64.Build.0 = Release|x64
 		{A4AE840D-BC01-4E60-B106-289218D9479F}.Release|x86.ActiveCfg = Release|x86
 		{A4AE840D-BC01-4E60-B106-289218D9479F}.Release|x86.Build.0 = Release|x86
-		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Debug|Any CPU.Build.0 = Debug|x86
 		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Debug|x64.ActiveCfg = Debug|x64
 		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Debug|x64.Build.0 = Debug|x64
 		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Debug|x86.ActiveCfg = Debug|x86
 		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Debug|x86.Build.0 = Debug|x86
-		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Release|Any CPU.ActiveCfg = Release|x86
+		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Release|Any CPU.Build.0 = Release|x86
 		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Release|x64.ActiveCfg = Release|x64
 		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Release|x64.Build.0 = Release|x64
 		{4B1587B5-0DE2-4E94-87FC-239D5E7FC4E7}.Release|x86.ActiveCfg = Release|x86
diff --git a/ZuneModdingHelper/App.xaml.cs b/ZuneModdingHelper/App.xaml.cs
index ce2a0c9..8507453 100644
--- a/ZuneModdingHelper/App.xaml.cs
+++ b/ZuneModdingHelper/App.xaml.cs
@@ -11,13 +11,13 @@ namespace ZuneModdingHelper
     /// </summary>
     public partial class App : Application
     {
-        public static readonly string Title = "Zune Modding Helper";
+        public const string Title = "Zune Modding Helper";
 
-        public static readonly Version VersionNum = new(2021, 5, 30, 0);
-        public static readonly string VersionStatus = "alpha";
+        public static readonly Version VersionNum = new(2021, 8, 4, 0);
+        public const string VersionStatus = "alpha";
         public static readonly string Version = VersionNum.ToString() + (VersionStatus != string.Empty ? "-" + VersionStatus : string.Empty);
 
-        public static readonly string DonateLink = "https://www.paypal.me/YoshiAsk";
+        public const string DonateLink = "https://www.paypal.me/YoshiAsk";
 
         protected override void OnStartup(StartupEventArgs e)
         {
diff --git a/ZuneModdingHelper/MainWindow.xaml b/ZuneModdingHelper/MainWindow.xaml
index 76eff2f..82045ab 100644
--- a/ZuneModdingHelper/MainWindow.xaml
+++ b/ZuneModdingHelper/MainWindow.xaml
@@ -55,38 +55,54 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         
-        <ListView x:Name="ModList" HorizontalContentAlignment="Stretch" SelectionMode="Multiple"
+        <ListView x:Name="ModList" HorizontalContentAlignment="Stretch"
                   ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+            <ListView.Resources>
+                <Style x:Key="MetroButton" TargetType="Button" BasedOn="{StaticResource MahApps.Styles.Button.Square}">
+                    <Setter Property="VerticalAlignment" Value="Center"/>
+                    <Setter Property="Margin" Value="8,0,0,0"/>
+                    <Setter Property="Grid.RowSpan" Value="3"/>
+                </Style>
+                <Style x:Key="MetroAccentButton" TargetType="Button" BasedOn="{StaticResource MahApps.Styles.Button.Square.Accent}">
+                    <Setter Property="VerticalAlignment" Value="Center"/>
+                    <Setter Property="Margin" Value="8,0,0,0"/>
+                    <Setter Property="Grid.RowSpan" Value="3"/>
+                </Style>
+            </ListView.Resources>
+            
             <ListView.ItemTemplate>
                 <DataTemplate DataType="{x:Type core:Mod}">
-                    <Grid Margin="8">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
+                    <Border BorderThickness="0,0,0,0" BorderBrush="{StaticResource MahApps.Brushes.Separator}">
+                        <Grid Margin="8">
 
-                        <TextBlock TextTrimming="CharacterEllipsis">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock TextTrimming="CharacterEllipsis">
                             <Run Text="{Binding Title, Mode=OneWay}" FontWeight="SemiBold" FontSize="16"/>
                             <Run Text=" By "/><Run Text="{Binding Author, Mode=OneWay}"/>
-                        </TextBlock>
-                        <TextBlock Text="{Binding Description}" Grid.Row="1" FontSize="14" TextWrapping="Wrap"/>
+                            </TextBlock>
+                            <TextBlock Text="{Binding Description}" Grid.Row="1" FontSize="14" TextWrapping="Wrap"/>
 
-                        <Button x:Name="ModResetButton" Grid.Column="1" Grid.RowSpan="3" VerticalAlignment="Center" Margin="8,0,0,0"
-                                Click="ModResetButton_Click" ToolTip="Reset" Style="{StaticResource MahApps.Styles.Button.Square}">
-                            <mah:FontIcon Glyph="&#xE10E;" FontFamily="Segoe MDL2 Assets" Margin="4" />
-                        </Button>
-                    </Grid>
-                    <!--<Border Padding="8" Margin="8" Background="White">
-                        
+                            <Button x:Name="ModResetButton" Grid.Column="1" Click="ModResetButton_Click" ToolTip="Reset"
+                                    Style="{StaticResource MetroButton}">
+                                <mah:FontIcon Glyph="&#xE10E;" FontFamily="Segoe MDL2 Assets" Margin="4" />
+                            </Button>
 
-                        <Border.Effect>
-                            <DropShadowEffect BlurRadius="8" ShadowDepth="2" Direction="-90" Opacity="0.25"/>
-                        </Border.Effect>
-                    </Border>-->
+                            <Button x:Name="ModInstallButton" Grid.Column="2" Click="ModInstallButton_Click" ToolTip="Install"
+                                    Style="{StaticResource MetroAccentButton}">
+                                <mah:FontIcon Glyph="&#xE73E;" FontFamily="Segoe MDL2 Assets" Margin="4" />
+                            </Button>
+                        </Grid>
+                    </Border>
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
@@ -102,12 +118,12 @@
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
 
-                <TextBlock Text="Zune Software install directory:" FontSize="14" Margin="4,4,0,2" />
+                <TextBlock Text="Zune software install directory:" FontSize="14" Margin="4,4,0,2" />
                 <TextBox x:Name="ZuneInstallDirBox" Grid.Row="1" Margin="4,0,0,4"/>
 
-                <Button x:Name="InstallModsButton" Content="Install" ToolTip="Install selected mods" Click="InstallModsButton_Click"
+                <Button x:Name="LocateZuneButton" Content="..." ToolTip="Locate Zune software..." Click="LocateZuneButton_Click"
                         Grid.Row="1" Grid.Column="1" VerticalAlignment="Stretch" HorizontalAlignment="Right" Margin="4,0,4,4"
-                        Style="{StaticResource MahApps.Styles.Button.MetroSquare.Accent}"/>
+                        Style="{StaticResource MahApps.Styles.Button.MetroSquare}"/>
             </Grid>
         </Border>
     </Grid>
diff --git a/ZuneModdingHelper/MainWindow.xaml.cs b/ZuneModdingHelper/MainWindow.xaml.cs
index 82d325c..a98b1e3 100644
--- a/ZuneModdingHelper/MainWindow.xaml.cs
+++ b/ZuneModdingHelper/MainWindow.xaml.cs
@@ -44,7 +44,7 @@ namespace ZuneModdingHelper
             ZuneInstallDirBox.Text = Mod.ZuneInstallDir;
         }
 
-        private async void InstallModsButton_Click(object sender, RoutedEventArgs e)
+        private async void ModInstallButton_Click(object sender, RoutedEventArgs e)
         {
             var progDialog = await this.ShowProgressAsync("Getting ready...", "Preparing to apply mods", settings: defaultMetroDialogSettings);
             Mod.ZuneInstallDir = ZuneInstallDirBox.Text;
@@ -242,5 +242,10 @@ namespace ZuneModdingHelper
         }
 
         private void DonateButton_Click(object sender, RoutedEventArgs e) => App.OpenInBrowser(App.DonateLink);
+
+        private void LocateZuneButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }
diff --git a/ZuneModdingHelper/ZuneModdingHelper.csproj b/ZuneModdingHelper/ZuneModdingHelper.csproj
index a8626d4..5a06cc0 100644
--- a/ZuneModdingHelper/ZuneModdingHelper.csproj
+++ b/ZuneModdingHelper/ZuneModdingHelper.csproj
@@ -5,11 +5,11 @@
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Version>2021.5.30.0</Version>
+    <Version>2021.8.4.0</Version>
     <Authors>Joshua "Yoshi" Askharoun</Authors>
-    <RepositoryUrl>https://github.com/yoshiask/ZuneModdingHelper</RepositoryUrl>
+    <RepositoryUrl>https://github.com/ZuneDev/ZuneModdingHelper</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Platforms>AnyCPU;x64;x86</Platforms>
+    <Platforms>x64;x86</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/ZuneModdingHelper/app.manifest b/ZuneModdingHelper/app.manifest
index 26d934e..ad14304 100644
--- a/ZuneModdingHelper/app.manifest
+++ b/ZuneModdingHelper/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="2021.5.30.0" name="ZuneModdingHelper.app"/>
+  <assemblyIdentity version="2021.8.4.0" name="ZuneModdingHelper.app"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">