From 4616515000fdf7a16b6117600284a9aaaac476d7 Mon Sep 17 00:00:00 2001
From: Joshua Askharoun <jjask7@gmail.com>
Date: Mon, 26 Apr 2021 16:24:32 -0500
Subject: [PATCH] Use Metro dialog for install progress

---
 ZuneModCore/Mods/WebservicesMod.cs   |  2 +-
 ZuneModdingHelper/MainWindow.xaml    | 17 --------------
 ZuneModdingHelper/MainWindow.xaml.cs | 33 ++++++++++++----------------
 3 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/ZuneModCore/Mods/WebservicesMod.cs b/ZuneModCore/Mods/WebservicesMod.cs
index 164e12b..521fab0 100644
--- a/ZuneModCore/Mods/WebservicesMod.cs
+++ b/ZuneModCore/Mods/WebservicesMod.cs
@@ -37,7 +37,7 @@ namespace ZuneModCore.Mods
             }
 
             // Make a backup of the file
-            File.Copy(zsDllInfo.FullName, Path.Combine(StorageDirectory, "ZuneService.original.dll"));
+            File.Copy(zsDllInfo.FullName, Path.Combine(StorageDirectory, "ZuneService.original.dll"), true);
 
             try
             {
diff --git a/ZuneModdingHelper/MainWindow.xaml b/ZuneModdingHelper/MainWindow.xaml
index 2ec658a..5d385fd 100644
--- a/ZuneModdingHelper/MainWindow.xaml
+++ b/ZuneModdingHelper/MainWindow.xaml
@@ -55,22 +55,5 @@
             <Button x:Name="InstallModsButton" Content="Install" ToolTip="Install selected mods" Click="InstallModsButton_Click"
                     Grid.RowSpan="2" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="4"/>
         </Grid>
-
-        <Border x:Name="ProgressBorder" Padding="8" Margin="8" Visibility="Collapsed" Grid.RowSpan="2">
-            <Grid>
-                <StackPanel Margin="50,8,50,8" VerticalAlignment="Center" HorizontalAlignment="Stretch">
-                    <TextBlock x:Name="ProgressDesc" Text="Preparing..." FontSize="14" FontWeight="SemiBold"
-                               HorizontalAlignment="Stretch" TextAlignment="Center"/>
-                    <mah:MetroProgressBar x:Name="Progress" Value="0" HorizontalAlignment="Stretch"/>
-                </StackPanel>
-
-                <Button x:Name="ProgressCloseButton" Content="Close" Visibility="Collapsed" Click="ProgressCloseButton_Click"
-                        HorizontalAlignment="Right" VerticalAlignment="Bottom"/>
-            </Grid>
-
-            <Border.Effect>
-                <DropShadowEffect BlurRadius="8" ShadowDepth="2" Direction="-90" Opacity="0.25"/>
-            </Border.Effect>
-        </Border>
     </Grid>
 </mah:MetroWindow>
diff --git a/ZuneModdingHelper/MainWindow.xaml.cs b/ZuneModdingHelper/MainWindow.xaml.cs
index b4131b9..d2f9424 100644
--- a/ZuneModdingHelper/MainWindow.xaml.cs
+++ b/ZuneModdingHelper/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 using ControlzEx.Theming;
 using MahApps.Metro.Controls;
+using MahApps.Metro.Controls.Dialogs;
 using OwlCore.AbstractUI.ViewModels;
 using System;
 using System.Collections.Generic;
@@ -40,21 +41,21 @@ namespace ZuneModdingHelper
 
         private async void InstallModsButton_Click(object sender, RoutedEventArgs e)
         {
-            ProgressCloseButton.Visibility = Visibility.Collapsed;
-            ProgressBorder.Visibility = Visibility.Visible;
+            var dialog = await this.ShowProgressAsync("Getting ready...", "Preparing to apply mods");
             ModList.IsEnabled = false;
             InstallModsButton.IsEnabled = false;
             Mod.ZuneInstallDir = ZuneInstallDirBox.Text;
             var selectedMods = ModList.SelectedItems.Cast<Mod>();
 
-            double progTotal = selectedMods.Count() * 2;
-            double progCompleted = 0;
+            dialog.Maximum = selectedMods.Count() * 2;
+            int numCompleted = 0;
 
+            dialog.SetTitle("Installing mods...");
             foreach (Mod mod in selectedMods)
             {
-                ProgressDesc.Text = $"Setting up '{mod.Title}'...";
+                dialog.SetMessage($"Setting up '{mod.Title}'");
                 await mod.Init();
-                Progress.Value = ++progCompleted / progTotal * 100;
+                dialog.SetProgress(++numCompleted);
 
                 // TODO: Implement AbstractUI display for options
                 //if (mod.OptionsUI != null)
@@ -64,29 +65,23 @@ namespace ZuneModdingHelper
                 //    optionsDialog.ShowDialog();
                 //}
 
-                ProgressDesc.Text = $"Applying '{mod.Title}'...";
+                dialog.SetMessage($"Applying '{mod.Title}'");
                 string applyResult = await mod.Apply();
                 if (applyResult != null)
                 {
-                    ProgressDesc.Text = $"Failed to apply '{mod.Title}':\r\n{applyResult}";
+                    dialog.SetMessage($"Failed to apply '{mod.Title}':\r\n{applyResult}");
                     await Task.Delay(15000);
                     continue;
                 }
-                Progress.Value = ++progCompleted / progTotal * 100;
+                dialog.SetProgress(++numCompleted);
             }
 
-            ProgressDesc.Text = "Completed";
-            ProgressCloseButton.Visibility = Visibility.Visible;
+            dialog.SetTitle("Completed");
+            dialog.SetMessage("Finished installing selected mods");
+            await Task.Delay(5000);
+            dialog.CloseAsync();
             ModList.IsEnabled = true;
             InstallModsButton.IsEnabled = true;
         }
-
-        private void ProgressCloseButton_Click(object sender, RoutedEventArgs e)
-        {
-            ProgressCloseButton.Visibility = Visibility.Collapsed;
-            ProgressBorder.Visibility = Visibility.Collapsed;
-            ProgressDesc.Text = "Preparing...";
-            Progress.Value = 0;
-        }
     }
 }